diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 13:20:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 13:20:28 +0300 |
| commit | a17de773fd86320c33668cd6d22e9d31954d2b34 (patch) | |
| tree | 91bd7e385aa59ad4e3d18452da29716acb91ded7 /source/blender/depsgraph/intern/depsgraph.cc | |
| parent | 6bac7c35e8bbed490d5db1af7758516eca0e919c (diff) | |
| parent | 93072e44d11efe9528d2bb7a3a62784331bf0a08 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 0ae5f44c3ed..987a0654cca 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -294,7 +294,7 @@ IDDepsNode *Depsgraph::find_id_node(const ID *id) const return reinterpret_cast<IDDepsNode *>(BLI_ghash_lookup(id_hash, id)); } -IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint) +IDDepsNode *Depsgraph::add_id_node(ID *id, ID *id_cow_hint) { BLI_assert((id->tag & LIB_TAG_COPY_ON_WRITE) == 0); IDDepsNode *id_node = find_id_node(id); @@ -302,9 +302,6 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint) DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_ID_REF); id_node = (IDDepsNode *)factory->create_node(id, "", id->name); id_node->init_copy_on_write(id_cow_hint); - if (do_tag) { - id->tag |= LIB_TAG_DOIT; - } /* Register node in ID hash. * * NOTE: We address ID nodes by the original ID pointer they are @@ -313,9 +310,6 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint) BLI_ghash_insert(id_hash, id, id_node); id_nodes.push_back(id_node); } - else if (do_tag) { - id->tag |= LIB_TAG_DOIT; - } return id_node; } |