[Bf-blender-cvs] [ac060232aae] master: Depsgraph: Pass bmain to evaluation function

[Sergey Sharybin]

Commit: ac060232aae2e70ff83c6926420a38f037bdee02
Author: Sergey Sharybin
Date:   Wed Sep 4 13:01:22 2019 +0200
Branches: master
https://developer.blender.org/rBac060232aae2e70ff83c6926420a38f037bdee02

Depsgraph: Pass bmain to evaluation function

Currently unused, makes code ready for an upcoming change.

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/depsgraph/DEG_depsgraph.h
M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/blender/editors/space_node/node_edit.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 885ce415ade..f26688515a1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1571,7 +1571,7 @@ static void scene_graph_update_tagged(Depsgraph *depsgraph, Main *bmain, bool on
   /* Update all objects: drivers, matrices, displists, etc. flags set
    * by depgraph or manual, no layer check here, gets correct flushed.
    */
-  DEG_evaluate_on_refresh(depsgraph);
+  DEG_evaluate_on_refresh(bmain, depsgraph);
   /* Update sound system. */
   BKE_scene_update_sound(depsgraph, bmain);
   /* Notify python about depsgraph update. */
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index 7553eca9b64..8e940ab1152 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -156,7 +156,7 @@ void DEG_evaluate_on_framechange(struct Main *bmain, Depsgraph *graph, float cti
 /* Data changed recalculation entry point.
  * < context_type: context to perform evaluation for
  */
-void DEG_evaluate_on_refresh(Depsgraph *graph);
+void DEG_evaluate_on_refresh(struct Main *bmain, Depsgraph *graph);
 
 bool DEG_needs_eval(Depsgraph *graph);
 
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 55241d03e94..d53d66aa55e 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(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);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index dcf901216f5..c5553a105fb 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -211,7 +211,7 @@ static void compo_initjob(void *cjv)
   /* NOTE: Don't update animation to preserve unkeyed changes, this means can not use
    * evaluate_on_framechange. */
   DEG_graph_flush_update(bmain, cj->compositor_depsgraph);
-  DEG_evaluate_on_refresh(cj->compositor_depsgraph);
+  DEG_evaluate_on_refresh(bmain, cj->compositor_depsgraph);
 
   bNodeTree *ntree_eval = (bNodeTree *)DEG_get_evaluated_id(cj->compositor_depsgraph,
                                                             &cj->ntree->id);