[Bf-blender-cvs] [4deddfca89b] blender2.8: Depsgraph: Pass explicit bmain to graph build finalization

[Sergey Sharybin]

Commit: 4deddfca89b010f0ab28e31a6ceaddeab924afaf
Author: Sergey Sharybin
Date:   Wed Oct 25 13:27:13 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4deddfca89b010f0ab28e31a6ceaddeab924afaf

Depsgraph: Pass explicit bmain to graph build finalization

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

M	source/blender/depsgraph/intern/builder/deg_builder.cc
M	source/blender/depsgraph/intern/builder/deg_builder.h
M	source/blender/depsgraph/intern/depsgraph_build.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 587d2021b52..4755e7d211d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -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();
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index c0731eeac20..c7ff668504c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -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
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index a8a09b8317b..7dd9d1451cd 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -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)) {