diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-27 18:12:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-28 18:35:12 +0300 |
| commit | 7895c6b83db862b13afee1facd8b6dc5e24dbede (patch) | |
| tree | 422a34d8058733d29d6fc54f34c8b3f5785595e5 /source/blender/blenkernel | |
| parent | 8d6732d1f7b801fc1353e6f7f83e079ae7d14c91 (diff) | |
Remove unused base flag
Was only set and read from a single location.
Removing to keep things more manageable.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 74c7ce6d9bd..cf8f94abdae 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -705,7 +705,7 @@ static short layer_collection_sync( if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) && ((object_restrict & OB_RESTRICT_VIEW) == 0)) { - base->flag |= BASE_ENABLED | BASE_ENABLED_VIEWPORT; + base->flag |= BASE_ENABLED_VIEWPORT; if ((child_layer_restrict & LAYER_COLLECTION_RESTRICT_VIEW) == 0) { base->flag |= BASE_VISIBLE; @@ -725,7 +725,7 @@ static short layer_collection_sync( } /* Update runtime flags used for display and tools. */ - if (base->flag & BASE_ENABLED) { + if (base->flag & BASE_ENABLED_VIEWPORT) { lc->runtime_flag |= LAYER_COLLECTION_HAS_ENABLED_OBJECTS; } @@ -782,7 +782,6 @@ void BKE_layer_collection_sync(const Scene *scene, ViewLayer *view_layer) /* Clear visible and selectable flags to be reset. */ for (Base *base = view_layer->object_bases.first; base; base = base->next) { base->flag &= ~(BASE_VISIBLE | - BASE_ENABLED | BASE_SELECTABLE | BASE_ENABLED_VIEWPORT | BASE_ENABLED_RENDER | diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index da6960ebc95..7f66cfd5dc3 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -430,14 +430,13 @@ void BKE_object_eval_eval_base_flags(Depsgraph *depsgraph, /* Compute visibility for depsgraph evaluation mode. */ if (base->flag & base_enabled_flag) { - base->flag |= BASE_ENABLED; /* When rendering, visibility is controlled by the enable/disable option. */ if (mode == DAG_EVAL_RENDER) { base->flag |= BASE_VISIBLE; } } else { - base->flag &= ~(BASE_ENABLED | BASE_VISIBLE | BASE_SELECTABLE); + base->flag &= ~(BASE_VISIBLE | BASE_SELECTABLE); } /* If base is not selectable, clear select. */ if ((base->flag & BASE_SELECTABLE) == 0) { |