mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-11-20 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1736 from Gasparoken/fix-buggy-timeline

Browse Source 
Fix timeline glitch playing linked frames (fix #1705)
This commit is contained in:
David Capello 2018-05-24 11:15:37 -03:00 committed by GitHub
commit d917ab7c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/ui/timeline/timeline.cpp
View File

@ -444,6 +444,17 @@ void Timeline::setFrame(frame_t frame, bool byUser)
else if (frame >= m_sprite->totalFrames())
frame = frame_t(m_sprite->totalFrames()-1);
if (m_layer) {
Cel* oldCel = m_layer->cel(m_frame);
Cel* newCel = m_layer->cel(frame);
std::size_t oldLinks = oldCel ? oldCel->links(): 0;
std::size_t newLinks = newCel ? newCel->links(): 0;
if ((oldLinks && !newCel) ||
( newLinks && !oldCel) ||
((oldLinks>0 || newLinks>0) && (oldCel->data() != newCel->data())))
invalidateLayer(m_layer);
}
invalidateFrame(m_frame);
invalidateFrame(frame);