[Bf-blender-cvs] [c4991c09714] blender2.8: Depsgraph: Remove bmain from graph

Sergey Sharybin noreply at git.blender.org
Wed Oct 25 13:45:16 CEST 2017


Commit: c4991c097142522d1ec6f97ca3d38f5d9390514c
Author: Sergey Sharybin
Date:   Wed Oct 25 13:28:06 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc4991c097142522d1ec6f97ca3d38f5d9390514c

Depsgraph: Remove bmain from graph

It really should not care about bmain.

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
M	source/blender/depsgraph/intern/depsgraph.h

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
index deed46339bb..b8a2fe4851d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
@@ -75,7 +75,6 @@ void DepsgraphRelationBuilder::build_scene(Main *bmain, Scene *scene)
 	}
 
 	/* XXX store scene to access from DAG_get_scene */
-	m_graph->bmain = bmain;
 	m_graph->scene = scene;
 
 	/* scene objects */
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 823a1935e18..889eb33c1bf 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -166,7 +166,6 @@ struct Depsgraph {
 	SpinLock lock;
 
 	// XXX: additional stuff like eval contexts, mempools for allocating nodes from, etc.
-	Main *bmain;  /* XXX: For until depsgraph has proper ownership. */
 	Scene *scene; /* XXX: We really shouldn't do that, but it's required for shader preview. */
 };



More information about the Bf-blender-cvs mailing list