diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-07 18:29:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-07 18:36:25 +0300 |
| commit | ba1197fe5e27f1cb7be281b3f20166a69050a273 (patch) | |
| tree | d2852f12af386701db2f3c8dddf96b185efb248e /source/blender/depsgraph | |
| parent | f16199d479189f1f142aebecf896182a7276c483 (diff) | |
Depsgraph: Simplify some workarounds and make API closer to final
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.cc | 5 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 10 |
3 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index e58a5707bc9..b6bf6c6fa78 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -275,7 +275,10 @@ void DEG_relations_tag_update(Main *bmain) DEG_DEBUG_PRINTF("%s: Tagging relations for update.\n", __func__); LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { - Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, scene_layer); + Depsgraph *depsgraph = + (Depsgraph *)BKE_scene_get_depsgraph(scene, + scene_layer, + false); if (depsgraph != NULL) { DEG_graph_tag_relations_update(depsgraph); } diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 820be5179b5..6dbbba0391b 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -85,7 +85,7 @@ void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx, eEvaluationMode mode) { DEG_evaluation_context_init(eval_ctx, mode); - eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, scene_layer); + eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false); eval_ctx->scene_layer = scene_layer; eval_ctx->engine = engine; eval_ctx->ctime = BKE_scene_frame_get(scene); diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 13f1506eadb..39505d256ec 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -353,7 +353,10 @@ void deg_id_tag_update(Main *bmain, ID *id, int flag) lib_id_recalc_tag_flag(bmain, id, flag); LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { - Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, scene_layer); + Depsgraph *depsgraph = + (Depsgraph *)BKE_scene_get_depsgraph(scene, + scene_layer, + false); if (depsgraph != NULL) { deg_graph_id_tag_update(bmain, depsgraph, id, flag); } @@ -461,7 +464,10 @@ void DEG_on_visible_update(Main *bmain, const bool UNUSED(do_time)) { LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { - Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, scene_layer); + Depsgraph *depsgraph = + (Depsgraph *)BKE_scene_get_depsgraph(scene, + scene_layer, + false); if (depsgraph != NULL) { DEG_graph_on_visible_update(bmain, depsgraph); } |