[Bf-blender-cvs] [b11926487f4] blender2.8: Depsgraph: Fix crash when trying to create full copy of scene

Sergey Sharybin noreply at git.blender.org
Mon Jul 24 16:24:57 CEST 2017


Commit: b11926487f42786300b57f8d712416ef9c9bf2e2
Author: Sergey Sharybin
Date:   Mon Jul 24 16:10:59 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb11926487f42786300b57f8d712416ef9c9bf2e2

Depsgraph: Fix crash when trying to create full copy of scene

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

M	source/blender/depsgraph/intern/depsgraph_tag.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index ce80f30f359..5c56b3f558b 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -195,9 +195,17 @@ void id_tag_update_object_data(Depsgraph *graph, IDDepsNode *id_node)
 		ID *data_id = (ID *)object->data;
 		if (data_id != NULL) {
 			IDDepsNode *data_id_node = graph->find_id_node(data_id);
-			BLI_assert(data_id_node != NULL);
+			// BLI_assert(data_id_node != NULL);
 			/* TODO(sergey): Do we want more granular tags here? */
-			data_id_node->tag_update(graph);
+			/* TODO(sergey): Hrm, during some operations it's possible to have
+			 * object node existing but not it's data. For example, when making
+			 * objects local. This is valid situation, but how can we distinguish
+			 * that from soneone trying to do stupid things with dependency
+			 * graph?
+			 */
+			if (data_id_node != NULL) {
+				data_id_node->tag_update(graph);
+			}
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list