Merge branch 'timeline-resume-state'

Author: rodlie

src/app/GUI/timelinedockwidget.cpp

@@ -63,6 +63,7 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     , mRenderProgressAct(nullptr)
     , mRenderProgress(nullptr)
     , mStepPreviewTimer(nullptr)
+    , mPausedPreviewState({false, 0})
 {
     connect(RenderHandler::sInstance, &RenderHandler::previewFinished,
             this, &TimelineDockWidget::previewFinished);
@@ -438,6 +439,7 @@ bool TimelineDockWidget::processKeyPress(QKeyEvent *event)
 
 void TimelineDockWidget::previewFinished()
 {
+    mPausedPreviewState.first = false;
     if (const auto scene = *mDocument.fActiveScene) {
         scene->setGizmosSuppressed(false);
     }
@@ -490,6 +492,8 @@ void TimelineDockWidget::previewBeingRendered()
 
 void TimelineDockWidget::previewPaused()
 {
+    mPausedPreviewState = {true, mDocument.getActiveSceneFrame()};
+
     if (const auto scene = *mDocument.fActiveScene) {
         scene->setGizmosSuppressed(false);
     }
@@ -543,6 +547,14 @@ bool TimelineDockWidget::setPrevKeyframe()
 void TimelineDockWidget::resumePreview()
 {
     if (eSettings::instance().fPreviewCache) {
+        if (mPausedPreviewState.first) {
+            const int frame = mDocument.getActiveSceneFrame();
+            if (mPausedPreviewState.second != frame) {
+                qDebug() << "set new start frame for preview" << frame;
+                RenderHandler::sInstance->setPreviewFrame(frame);
+                mPausedPreviewState.first = false;
+            }
+        }
         RenderHandler::sInstance->resumePreview();
     } else { setStepPreviewStart(); }
 }

src/app/GUI/timelinedockwidget.h

@@ -141,6 +141,8 @@ class TimelineDockWidget : public QWidget
 
     QList<TimelineWidget*> mTimelineWidgets;
     //AnimationDockWidget *mAnimationDockWidget;
+
+    QPair<bool,int> mPausedPreviewState;
 };
 
 #endif // BOXESLISTANIMATIONDOCKWIDGET_H

src/app/renderhandler.cpp

@@ -120,6 +120,11 @@ void RenderHandler::renderFromSettings(RenderInstanceSettings * const settings)
     }
 }
 
+void RenderHandler::setPreviewFrame(const int &frame)
+{
+    mCurrentPreviewFrame = frame;
+}
+
 void RenderHandler::setLoop(const bool loop) {
     mLoop = loop;
 }

src/app/renderhandler.h

@@ -62,6 +62,8 @@ class RenderHandler : public QObject {
     void renderPreview();
     void renderFromSettings(RenderInstanceSettings * const settings);
 
+    void setPreviewFrame(const int &frame);
+
     void setLoop(const bool loop);
 
     PreviewState currentPreviewState() const