diff options
| author | Bob Zeleznik <zzzman@gmail.com> | 2020-06-28 17:02:08 -0400 |
|---|---|---|
| committer | Bob Zeleznik <zzzman@gmail.com> | 2020-06-28 17:02:08 -0400 |
| commit | 777030e88d177daa1f61365c22b945b8808ec61a (patch) | |
| tree | 0e03fb85b8df64367b6eae36cacf42430ace408c /src/client/views/animationtimeline/Timeline.tsx | |
| parent | b79b5ebfd4f8ea8b4ae793e59f05b5bfe79b9b8a (diff) | |
| parent | 7a78bc39fa2b005d67499bcd6baf19b9dce0eb18 (diff) | |
Merge branch 'master' into 3D_carousel
Diffstat (limited to 'src/client/views/animationtimeline/Timeline.tsx')
| -rw-r--r-- | src/client/views/animationtimeline/Timeline.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx index ab984f727..f54bd3aff 100644 --- a/src/client/views/animationtimeline/Timeline.tsx +++ b/src/client/views/animationtimeline/Timeline.tsx @@ -288,13 +288,13 @@ export class Timeline extends React.Component<FieldViewProps> { resetView(doc: Doc) { doc._panX = doc._customOriginX ?? 0; doc._panY = doc._customOriginY ?? 0; - doc.scale = doc._customOriginScale ?? 1; + doc._viewScale = doc._customOriginScale ?? 1; } setView(doc: Doc) { doc._customOriginX = doc._panX; doc._customOriginY = doc._panY; - doc._customOriginScale = doc.scale; + doc._customOriginScale = doc._viewScale; } /** * zooming mechanism (increment and spacing changes) |