fixed animation timeline to not fade in/out the collection. fixed keyframe animator to interpolate colors.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index f36b5ade8..d959241d0 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -252,6 +252,9 @@ export class Track extends React.Component<IProps> {
     @action
     private applyKeys = (kf: Doc) => {
         this.primitiveWhitelist.forEach(key => {
+            if (key === 'opacity' && this.props.animatedDoc === this.props.collection) {
+                return;
+            }
             if (!kf[key]) {
                 this.props.animatedDoc[key] = undefined;
             } else {
diff --git a/src/client/views/global/globalScripts.ts b/src/client/views/global/globalScripts.ts
index 8c49dc6ea..d2df58102 100644
--- a/src/client/views/global/globalScripts.ts
+++ b/src/client/views/global/globalScripts.ts
@@ -53,7 +53,7 @@ ScriptingGlobals.add(function setBackgroundColor(color?: string, checkResult?: b
             const contentFrameNumber = Cast(dv.rootDoc?._currentFrame, 'number', layoutFrameNumber ?? null); // frame number that content is at which determines what content is displayed
             if (contentFrameNumber !== undefined) {
                 const obj: { [key: string]: Opt<string> } = {};
-                obj[fieldKey as any] = color;
+                obj[fieldKey] = color;
                 CollectionFreeFormDocumentView.setStringValues(contentFrameNumber, dv.rootDoc, obj);
             } else {
                 dv.rootDoc['_' + fieldKey] = color;