diff options
author | Alexander Gavrilov <angavrilov@gmail.com> | 2018-10-25 10:29:17 +0300 |
---|---|---|
committer | Alexander Gavrilov <angavrilov@gmail.com> | 2018-10-25 10:32:32 +0300 |
commit | c25fa615d44db8575449fb6a8fff54af4d96ad92 (patch) | |
tree | b2db17ffebc3f13b1e89b834117fcd4ca192e844 /source | |
parent | 1a827e0564b7465320467b8eb508ed073ae5781f (diff) |
Depsgraph: don't lose the update tag on rebuild for op nodes with a name.
This fixes a missing update when clearing the Text On Curve
(follow_curve) option of a text object.
Diffstat (limited to 'source')
-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 4e6435eacef..1aabb926d29 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -373,6 +373,7 @@ void DepsgraphNodeBuilder::begin_build() entry_tag.id_orig = id_node->id_orig; entry_tag.component_type = comp_node->type; entry_tag.opcode = op_node->opcode; + entry_tag.name = op_node->name; saved_entry_tags_.push_back(entry_tag); }; GSET_FOREACH_END(); @@ -395,7 +396,7 @@ void DepsgraphNodeBuilder::end_build() if (comp_node == NULL) { continue; } - OperationDepsNode *op_node = comp_node->find_operation(entry_tag.opcode); + OperationDepsNode *op_node = comp_node->find_operation(entry_tag.opcode, entry_tag.name, -1); 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 4d4939b4dd3..1e4ef9718e0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -244,6 +244,7 @@ protected: ID *id_orig; eDepsNode_Type component_type; eDepsOperation_Code opcode; + const char *name; }; vector<SavedEntryTag> saved_entry_tags_; |