mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-22 06:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use Timeline range if it's hidden in editor site & moving cel

Browse Source
This commit is contained in:
David Capello 2021-04-08 15:17:39 -03:00
parent f3ab779bfd
commit f91c07825b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/ui/editor/editor.cpp
View File

@ -1,5 +1,5 @@
// Aseprite // Aseprite
// Copyright (C) 2018-2020 Igara Studio S.A. // Copyright (C) 2018-2021 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello // Copyright (C) 2001-2018 David Capello
// //
// This program is distributed under the terms of // This program is distributed under the terms of
@ -391,6 +391,7 @@ void Editor::getSite(Site* site) const
// TODO we should not access timeline directly here // TODO we should not access timeline directly here
Timeline* timeline = App::instance()->timeline(); Timeline* timeline = App::instance()->timeline();
if (timeline && if (timeline &&
timeline->isVisible() &&
timeline->range().enabled()) { timeline->range().enabled()) {
site->range(timeline->range()); site->range(timeline->range());
} }

6
src/app/ui/editor/moving_cel_state.cpp
View File

@ -47,8 +47,10 @@ MovingCelCollect::MovingCelCollect(Editor* editor, Layer* layer)
if (layer && layer->isImage()) if (layer && layer->isImage())
m_mainCel = layer->cel(editor->frame()); m_mainCel = layer->cel(editor->frame());
DocRange range = App::instance()->timeline()->range(); Timeline* timeline = App::instance()->timeline();
if (!range.enabled()) { DocRange range = timeline->range();
if (!range.enabled() ||
!timeline->isVisible()) {
range.startRange(editor->layer(), editor->frame(), DocRange::kCels); range.startRange(editor->layer(), editor->frame(), DocRange::kCels);
range.endRange(editor->layer(), editor->frame()); range.endRange(editor->layer(), editor->frame());
} }