Skip to content

Commit

Permalink
Merge branch 'parallaxe_movement' into lamhauge_p2d
Browse files Browse the repository at this point in the history
  • Loading branch information
davidlamhauge committed Feb 28, 2024
2 parents d743e73 + 8564739 commit 335d490
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/src/actioncommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ void ActionCommands::interpolateKeyframes()
return;
}

layer->deselectAll();
BitmapImage* img1 = layer->getBitmapImageAtFrame(first);
mEditor->scrubTo(first);
QRect rect1 = img1->bounds();
Expand All @@ -704,6 +705,8 @@ void ActionCommands::interpolateKeyframes()
keyframe = layer->getKeyFrameAt(i - 1);
KeyFrame* dupKey = keyframe->clone();
layer->addKeyFrame(i, dupKey);
mEditor->scrubTo(i);
emit mEditor->frameModified(i);
BitmapImage* image = layer->getBitmapImageAtFrame(i);
percent = counter / interpolations;
QRect transformer = QRect(upperLine.pointAt(percent).toPoint(),
Expand All @@ -712,10 +715,7 @@ void ActionCommands::interpolateKeyframes()
image->modification();
counter++;
layer->markFrameAsDirty(i);
mEditor->scrubTo(i);
}
emit mEditor->updateTimeLine();
emit mEditor->framesModified();
mEditor->scrubTo(last);
}

Expand Down

0 comments on commit 335d490

Please sign in to comment.