Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-07-31 17:38:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-07-31 17:40:10 +0300
commit96843ae85cc040b36de34061a29790dc2e096eec (patch)
tree78ddc80e65825151f3a0d28eae9767add40e28df /source/blender/depsgraph/intern/eval/deg_eval_flush.cc
parentbc42092a7ddbc888e1bc3ef74caeb0140037c560 (diff)
Fix T67883: Time Remapping doesn't work
Was caused by 1693a5efe91.
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_flush.cc')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_flush.cc3
1 files changed, 2 insertions, 1 deletions
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);