[Bf-blender-cvs] [a80b74ab0de] blender2.8: Depsgraph: Fix warning with Empty objects
Sergey Sharybin
noreply at git.blender.org
Tue Nov 21 16:12:59 CET 2017
Commit: a80b74ab0decc95f4e6ca69c7af60f8a28868645
Author: Sergey Sharybin
Date: Tue Nov 21 15:47:47 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa80b74ab0decc95f4e6ca69c7af60f8a28868645
Depsgraph: Fix warning with Empty objects
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index e028a81d423..6a9023b5b6a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2092,10 +2092,15 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDDepsNode *id_node
if (GS(id_orig->name) == ID_OB) {
Object *object = (Object *)id_orig;
ID *object_data_id = (ID *)object->data;
- OperationKey data_copy_on_write_key(object_data_id,
- DEG_NODE_TYPE_COPY_ON_WRITE,
- DEG_OPCODE_COPY_ON_WRITE);
- add_relation(data_copy_on_write_key, copy_on_write_key, "Eval Order");
+ if (object_data_id != NULL) {
+ OperationKey data_copy_on_write_key(object_data_id,
+ DEG_NODE_TYPE_COPY_ON_WRITE,
+ DEG_OPCODE_COPY_ON_WRITE);
+ add_relation(data_copy_on_write_key, copy_on_write_key, "Eval Order");
+ }
+ else {
+ BLI_assert(object->type == OB_EMPTY);
+ }
}
}
More information about the Bf-blender-cvs
mailing list