[Bf-blender-cvs] [d84c80b] depsgraph_refactor: Depsgraph: Correction for depsgraph rebuild

Sergey Sharybin noreply at git.blender.org
Mon Feb 2 14:13:38 CET 2015


Commit: d84c80b9917ff3adcd8b0c107101abc938b2c1fc
Author: Sergey Sharybin
Date:   Mon Feb 2 18:12:14 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBd84c80b9917ff3adcd8b0c107101abc938b2c1fc

Depsgraph: Correction for depsgraph rebuild

Make sure tags are not getting lost after graph rebuild.

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

M	source/blender/depsgraph/intern/depsgraph_build.cpp

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

diff --git a/source/blender/depsgraph/intern/depsgraph_build.cpp b/source/blender/depsgraph/intern/depsgraph_build.cpp
index a442c56..1f710a2 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build.cpp
@@ -665,10 +665,7 @@ void DEG_scene_relations_update(Main *bmain, Scene *scene)
 void DEG_scene_relations_rebuild(Main *bmain, Scene *scene)
 {
 	if (scene->depsgraph != NULL) {
-		BLI_assert(scene->depsgraph->entry_tags.size() == 0);
-		BLI_assert(scene->depsgraph->id_tags.size() == 0);
-		DEG_graph_free(scene->depsgraph);
-		scene->depsgraph = NULL;
+		DEG_graph_tag_relations_update(scene->depsgraph);
 	}
 	DEG_scene_relations_update(bmain, scene);
 }




More information about the Bf-blender-cvs mailing list