[Bf-blender-cvs] [99ffd7b35d0] blender2.8: Depsgraph: Fix/workaround crash when toggling edit mode
Sergey Sharybin
noreply at git.blender.org
Tue Nov 21 16:12:56 CET 2017
Commit: 99ffd7b35d0ea74fd5079ebabb7ae5c6a10484a4
Author: Sergey Sharybin
Date: Tue Nov 21 15:34:13 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB99ffd7b35d0ea74fd5079ebabb7ae5c6a10484a4
Depsgraph: Fix/workaround crash when toggling edit mode
===================================================================
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 ce16a986dff..e028a81d423 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2086,6 +2086,17 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDDepsNode *id_node
*/
}
GHASH_FOREACH_END();
+ /* TODO(sergey): This solves crash for now, but causes too many
+ * updates potentially.
+ */
+ 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");
+ }
}
} // namespace DEG
More information about the Bf-blender-cvs
mailing list