diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 16:39:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 16:43:32 +0300 |
| commit | 81f135677be419a505a38f5a23354690a75b678b (patch) | |
| tree | b5e3dede5a4b7693affa9ad4c27c51dbe3a2ff78 /source/blender/depsgraph/intern/depsgraph_tag.cc | |
| parent | 4838512e7d495cb74ac599a8cd4c788d006c843c (diff) | |
Depsgraph: Cleanup, use less explicit checks of LIB_TAG_ID_RECALC_DATA
This is a part of ongoing work in Blender 2.8, where we need to replace
`object->id.tag & LIB_TAG_ID_RECALC_DATA`
with
`object->data->id.tag & LIB_TAG_ID_RECALC`
Should be no user measurable difference.
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_tag.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index eafb091e53a..8f91a826760 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -409,12 +409,12 @@ void DEG_ids_clear_recalc(Main *bmain) if (id && bmain->id_tag_update[BKE_idcode_to_index(GS(id->name))]) { for (; id; id = (ID *)id->next) { - id->tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA); + id->tag &= ~LIB_TAG_ID_RECALC_ALL; /* Some ID's contain semi-datablock nodetree */ ntree = ntreeFromID(id); if (ntree != NULL) { - ntree->id.tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA); + ntree->id.tag &= ~LIB_TAG_ID_RECALC_ALL; } } } |