diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-09-04 17:40:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-09-05 12:57:20 +0300 |
| commit | 31c2929496c2e778a162020215fb6d643d82581c (patch) | |
| tree | cfc2b2a16d7024084afcebdf24cf926b95541b0f /source/blender/depsgraph | |
| parent | ac060232aae2e70ff83c6926420a38f037bdee02 (diff) | |
Depsgraph: Free user code from worry about updates flush
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 5 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 8 |
3 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 8e940ab1152..d4518729d99 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -128,11 +128,6 @@ void DEG_id_type_tag(struct Main *bmain, short id_type); void DEG_ids_clear_recalc(struct Main *bmain, Depsgraph *depsgraph); -/* Update Flushing ------------------------------- */ - -/* Flush updates for IDs in a single scene. */ -void DEG_graph_flush_update(struct Main *bmain, Depsgraph *depsgraph); - /* Check if something was changed in the database and inform * editors about this. */ diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index d53d66aa55e..b2b7d2a9d00 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -49,7 +49,7 @@ extern "C" { #include "intern/depsgraph.h" /* Evaluate all nodes tagged for updating. */ -void DEG_evaluate_on_refresh(Main * /*bmain*/, Depsgraph *graph) +void DEG_evaluate_on_refresh(Main *bmain, Depsgraph *graph) { DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph); deg_graph->ctime = BKE_scene_frame_get(deg_graph->scene); @@ -60,6 +60,7 @@ void DEG_evaluate_on_refresh(Main * /*bmain*/, Depsgraph *graph) if (deg_graph->scene_cow) { BKE_scene_frame_set(deg_graph->scene_cow, deg_graph->ctime); } + DEG::deg_graph_flush_updates(bmain, deg_graph); DEG::deg_evaluate_on_refresh(deg_graph); deg_graph->need_update_time = false; } diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 72ef495f1d5..647837bd758 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -779,14 +779,6 @@ void DEG_id_type_tag(Main *bmain, short id_type) } } -void DEG_graph_flush_update(Main *bmain, Depsgraph *depsgraph) -{ - if (depsgraph == NULL) { - return; - } - DEG::deg_graph_flush_updates(bmain, (DEG::Depsgraph *)depsgraph); -} - /* Update dependency graph when visible scenes/layers changes. */ void DEG_graph_on_visible_update(Main *bmain, Depsgraph *depsgraph, const bool do_time) { |