diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
| commit | 9c0a250fd412c46861f72d8bb7cc5535b101c0fa (patch) | |
| tree | ff24809b94f06b3fb12ce47dbd94e14cdc615baa /src/client/views/animationtimeline | |
| parent | 6ad7fac6342204bc489ef49cb3ba8f450bfa3824 (diff) | |
| parent | 29f9cedd937697c56ce3b400931b26c82a23721d (diff) | |
merge conflicts resolved
Diffstat (limited to 'src/client/views/animationtimeline')
| -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) |