aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2023-10-27 13:51:34 -0400
committerbobzel <zzzman@gmail.com>2023-10-27 13:51:34 -0400
commit7e01a1fdad85e5aa3d73f166b7663d34337bb040 (patch)
treea96dd80ffa7a68d1ff55d6a41f320ec62af02791 /src
parenta866baea5fdbf30650cbfbf4aa383019ef61ec3d (diff)
from last
Diffstat (limited to 'src')
-rw-r--r--src/client/views/animationtimeline/Track.tsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index dfab849a4..f36b5ade8 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -181,7 +181,7 @@ export class Track extends React.Component<IProps> {
this.timeChange();
} else {
this.props.animatedDoc.hidden = true;
- this.props.animatedDoc.opacity = 0;
+ this.props.animatedDoc !== this.props.collection && (this.props.animatedDoc.opacity = 0);
//if (this._autoKfReaction) this._autoKfReaction();
}
}
@@ -280,6 +280,9 @@ export class Track extends React.Component<IProps> {
@action
interpolate = (left: Doc, right: Doc) => {
this.primitiveWhitelist.forEach(key => {
+ if (key === 'opacity' && this.props.animatedDoc === this.props.collection) {
+ return;
+ }
if (typeof left[key] === 'number' && typeof right[key] === 'number') {
//if it is number, interpolate
const dif = NumCast(right[key]) - NumCast(left[key]);