From 3451cb56dbb368b82b2d36327288e064b5d32f04 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 3 Sep 2018 12:57:04 +0200 Subject: Depsgraph: Cleanup, make it more obvious what ID references --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 4 ++-- source/blender/depsgraph/intern/builder/deg_builder_nodes.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/depsgraph') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 5e3496fa5a7..06e37ab5be7 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -357,7 +357,7 @@ void DepsgraphNodeBuilder::begin_build() IDDepsNode *id_node = comp_node->owner; SavedEntryTag entry_tag; - entry_tag.id = id_node->id_orig; + entry_tag.id_orig = id_node->id_orig; entry_tag.component_type = comp_node->type; entry_tag.opcode = op_node->opcode; saved_entry_tags_.push_back(entry_tag); @@ -373,7 +373,7 @@ void DepsgraphNodeBuilder::begin_build() void DepsgraphNodeBuilder::end_build() { foreach (const SavedEntryTag& entry_tag, saved_entry_tags_) { - IDDepsNode *id_node = find_id_node(entry_tag.id); + IDDepsNode *id_node = find_id_node(entry_tag.id_orig); if (id_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 eadf4a23a5e..b35e07cc333 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -229,7 +229,7 @@ protected: * since it will change during dependency graph construction. */ struct SavedEntryTag { - ID *id; + ID *id_orig; eDepsNode_Type component_type; eDepsOperation_Code opcode; }; -- cgit v1.2.3