diff options
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 23 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_component.h | 19 |
2 files changed, 24 insertions, 18 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index b1204c9366c..851d0bcf000 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -898,6 +898,29 @@ ID *deg_update_copy_on_write_datablock(const Depsgraph *depsgraph, const IDNode if (!deg_copy_on_write_is_needed(id_orig)) { return id_cow; } + + /* When updating object data in edit-mode, don't request COW update since this will duplicate + * all object data which is unnecessary when the edit-mode data is used for calculating + * modifiers. + * + * TODO: Investigate modes besides edit-mode. */ + if (check_datablock_expanded(id_cow)) { + const ID_Type id_type = GS(id_orig->name); + if (OB_DATA_SUPPORT_EDITMODE(id_type) && BKE_object_data_is_in_editmode(id_orig)) { + /* Make sure pointers in the edit mode data are updated in the copy. + * This allows depsgraph to pick up changes made in another context after it has been + * evaluated. Consider the following scenario: + * + * - ObjectA in SceneA is using Mesh. + * - ObjectB in SceneB is using Mesh (same exact datablock). + * - Depsgraph of SceneA is evaluated. + * - Depsgraph of SceneB is evaluated. + * - User enters edit mode of ObjectA in SceneA. */ + update_edit_mode_pointers(depsgraph, id_orig, id_cow); + return id_cow; + } + } + RuntimeBackup backup(depsgraph); backup.init_from_id(id_cow); deg_free_copy_on_write_datablock(id_cow); diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index 8fd28dfc497..f7acd8c72c3 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -163,23 +163,6 @@ struct ComponentNode : public Node { DEG_COMPONENT_NODE_DECLARE; \ } -/* When updating object data in edit-mode, don't request COW update since this will duplicate - * all object data which is unnecessary when the edit-mode data is used for calculating modifiers. - * - * TODO: Investigate modes besides edit-mode. */ -#define DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_OBDATA_IN_EDIT_MODE(name) \ - struct name##ComponentNode : public ComponentNode { \ - DEG_COMPONENT_NODE_DECLARE; \ - virtual bool need_tag_cow_before_update() override \ - { \ - if (OB_DATA_SUPPORT_EDITMODE(owner->id_type) && \ - BKE_object_data_is_in_editmode(owner->id_orig)) { \ - return false; \ - } \ - return true; \ - } \ - } - #define DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_UPDATE(name) \ struct name##ComponentNode : public ComponentNode { \ DEG_COMPONENT_NODE_DECLARE; \ @@ -202,7 +185,7 @@ DEG_COMPONENT_NODE_DECLARE_GENERIC(Animation); DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_UPDATE(BatchCache); DEG_COMPONENT_NODE_DECLARE_GENERIC(Cache); DEG_COMPONENT_NODE_DECLARE_GENERIC(CopyOnWrite); -DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_OBDATA_IN_EDIT_MODE(Geometry); +DEG_COMPONENT_NODE_DECLARE_GENERIC(Geometry); DEG_COMPONENT_NODE_DECLARE_GENERIC(ImageAnimation); DEG_COMPONENT_NODE_DECLARE_GENERIC(LayerCollections); DEG_COMPONENT_NODE_DECLARE_GENERIC(Particles); |