griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Pass bmain to evaluation function

Browse Source 
Currently unused, makes code ready for an upcoming change.
This commit is contained in:
Sergey Sharybin
2019-09-04 13:01:22 +02:00
parent f2400c1bb5
commit ac060232aa
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/scene.c
View File

@@ -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. */

2
source/blender/depsgraph/DEG_depsgraph.h
View File

@@ -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);

2
source/blender/depsgraph/intern/depsgraph_eval.cc
View File

@@ -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);

2
source/blender/editors/space_node/node_edit.c
View File

@@ -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);