diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-27 19:09:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-28 18:35:12 +0300 |
| commit | 846d265a06e39c86574cba6722495b6373596c7a (patch) | |
| tree | c8534796d130c03faa4bcdc3d7fa558f1a361113 /source/blender/blenkernel/intern/object_update.c | |
| parent | 7895c6b83db862b13afee1facd8b6dc5e24dbede (diff) | |
Split base flags on own and collection-defined
This allows to update base flags to a proper state then object's restriction
flags are changed, without requiring to re-evaluate an entire tree of flags.
Some old unused flags are were removed by this change, and also disabling
menu items might not work the same as before. This is something we can bring
back if it's really needed (the way how flags are handled did change since
that interface code was done anyway, so code was looking weird anyway).
Reviewers: brecht
Differential Revision: https://developer.blender.org/D4420
Diffstat (limited to 'source/blender/blenkernel/intern/object_update.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 7f66cfd5dc3..60cf4d1b1d4 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -44,6 +44,7 @@ #include "BKE_effect.h" #include "BKE_image.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_material.h" @@ -428,6 +429,8 @@ void BKE_object_eval_eval_base_flags(Depsgraph *depsgraph, ? BASE_ENABLED_VIEWPORT : BASE_ENABLED_RENDER; + BKE_base_eval_flags(base); + /* Compute visibility for depsgraph evaluation mode. */ if (base->flag & base_enabled_flag) { /* When rendering, visibility is controlled by the enable/disable option. */ |