diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2018-10-29 20:52:32 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2018-10-29 20:54:38 +0300 |
| commit | bb770a2c85ffc76018aa28a4a941df1c6081530e (patch) | |
| tree | d7c4ce904152d58a05e7da8ef633b4b8d9d97233 /source/blender/depsgraph/intern/builder | |
| parent | 62e2bbd068dd689620063ccf9e75db71e9931056 (diff) | |
Depsgraph: use full operation key to preserve update tags on rebuild.
The key used by find_operation consists of the operation code,
node name, and an index for array property drivers. All three
elements are required to unambiguously look up a node.
Diffstat (limited to 'source/blender/depsgraph/intern/builder')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index f929517f683..9ae32eeb7de 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -374,6 +374,7 @@ void DepsgraphNodeBuilder::begin_build() entry_tag.component_type = comp_node->type; entry_tag.opcode = op_node->opcode; entry_tag.name = op_node->name; + entry_tag.name_tag = op_node->name_tag; saved_entry_tags_.push_back(entry_tag); }; GSET_FOREACH_END(); @@ -396,7 +397,7 @@ void DepsgraphNodeBuilder::end_build() if (comp_node == NULL) { continue; } - OperationDepsNode *op_node = comp_node->find_operation(entry_tag.opcode, entry_tag.name, -1); + OperationDepsNode *op_node = comp_node->find_operation(entry_tag.opcode, entry_tag.name, entry_tag.name_tag); if (op_node == NULL) { continue; } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 1e4ef9718e0..47324968776 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -245,6 +245,7 @@ protected: eDepsNode_Type component_type; eDepsOperation_Code opcode; const char *name; + int name_tag; }; vector<SavedEntryTag> saved_entry_tags_; |