[Bf-blender-cvs] [96843ae85cc] master: Fix T67883: Time Remapping doesn't work

[Sergey Sharybin]

Commit: 96843ae85cc040b36de34061a29790dc2e096eec
Author: Sergey Sharybin
Date:   Wed Jul 31 16:38:04 2019 +0200
Branches: master
https://developer.blender.org/rB96843ae85cc040b36de34061a29790dc2e096eec

Fix T67883: Time Remapping doesn't work

Was caused by 1693a5efe91.

===================================================================

M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 8079a3df879..b03da157e7c 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -30,6 +30,7 @@
 #include <cmath>
 
 #include "BKE_object.h"
+#include "BKE_scene.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
@@ -355,7 +356,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
   }
   if (graph->need_update_time) {
     const Scene *scene_orig = graph->scene;
-    const float ctime = scene_orig->r.cfra + scene_orig->r.subframe;
+    const float ctime = BKE_scene_frame_get(scene_orig);
     DEG::TimeSourceNode *time_source = graph->find_time_source();
     graph->ctime = ctime;
     time_source->tag_update(graph, DEG::DEG_UPDATE_SOURCE_TIME);