diff options
Diffstat (limited to 'source/blender/depsgraph/intern/node/deg_node_id.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_id.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 8d19949adc8..345da466960 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -41,8 +41,7 @@ #include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_time.h" -namespace blender { -namespace deg { +namespace blender::deg { const char *linkedStateAsString(eDepsNode_LinkedState_Type linked_state) { @@ -137,7 +136,7 @@ void IDNode::destroy() } /* Free memory used by this CoW ID. */ - if (id_cow != id_orig && id_cow != nullptr) { + if (!ELEM(id_cow, id_orig, nullptr)) { deg_free_copy_on_write_datablock(id_cow); MEM_freeN(id_cow); id_cow = nullptr; @@ -213,5 +212,4 @@ IDComponentsMask IDNode::get_visible_components_mask() const return result; } -} // namespace deg -} // namespace blender +} // namespace blender::deg |