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

Depsgraph: Pass explicit bmain to graph build finalization

Browse Source
This commit is contained in:
Sergey Sharybin
2017-10-25 13:27:13 +02:00
parent 86761a2cd7
commit 4deddfca89
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/depsgraph/intern/builder/deg_builder.cc
View File

@@ -45,7 +45,7 @@
namespace DEG {
void deg_graph_build_finalize(Depsgraph *graph)
void deg_graph_build_finalize(Main *bmain, Depsgraph *graph)
{
const bool use_copy_on_write = DEG_depsgraph_use_copy_on_write();
/* Re-tag IDs for update if it was tagged before the relations
@@ -68,7 +68,7 @@ void deg_graph_build_finalize(Depsgraph *graph)
* re-evaluaiton of the whole tree.
*/
if (use_copy_on_write) {
DEG_id_tag_update_ex(graph->bmain, id_node->id_orig, DEG_TAG_COPY_ON_WRITE);
DEG_id_tag_update_ex(bmain, id_node->id_orig, DEG_TAG_COPY_ON_WRITE);
}
}
GHASH_FOREACH_END();

4
source/blender/depsgraph/intern/builder/deg_builder.h
View File

@@ -30,10 +30,12 @@
#pragma once
struct Main;
namespace DEG {
struct Depsgraph;
void deg_graph_build_finalize(struct Depsgraph *graph);
void deg_graph_build_finalize(struct Main *bmain, struct Depsgraph *graph);
} // namespace DEG

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

@@ -233,7 +233,7 @@ void DEG_graph_build_from_scene(Depsgraph *graph, Main *bmain, Scene *scene)
}
/* 4) Flush visibility layer and re-schedule nodes for update. */
DEG::deg_graph_build_finalize(deg_graph);
DEG::deg_graph_build_finalize(bmain, deg_graph);
#if 0
if (!DEG_debug_consistency_check(deg_graph)) {