diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 15:42:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 16:04:33 +0300 |
| commit | 8534ce93842d848e726e71aead33c77ef975f9bb (patch) | |
| tree | 26a740c0da368813523edd317a1d02a04c47e2c5 /source/blender/blenkernel/intern | |
| parent | c054a1a84867e652cd737cdab7ca790b6e038303 (diff) | |
Revert "Objects: when active object gets hidden, make it inactive."
This reverts commit fec97ec949, it's useful to be able to edit object
properties for hidden objects. The issue with mode locking that this
was meant to solve will be handled in another way.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index db9ce76b30c..c44884c3dbf 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1401,10 +1401,9 @@ void BKE_layer_eval_view_layer( view_layer->object_bases_array[base_index++] = base; } - /* Flush back base flag to the original view layer for editing. */ - ViewLayer *view_layer_orig = DEG_get_input_view_layer(depsgraph); if (view_layer == DEG_get_evaluated_view_layer(depsgraph)) { + ViewLayer *view_layer_orig = DEG_get_input_view_layer(depsgraph); Base *base_orig = view_layer_orig->object_bases.first; const Base *base_eval = view_layer->object_bases.first; while (base_orig != NULL) { @@ -1413,14 +1412,6 @@ void BKE_layer_eval_view_layer( base_eval = base_eval->next; } } - - /* Hidden objects can't be active. */ - if (view_layer->basact && !(view_layer->basact->flag & BASE_VISIBLED)) { - view_layer->basact = NULL; - } - if (view_layer_orig->basact && !(view_layer_orig->basact->flag & BASE_VISIBLED)) { - view_layer_orig->basact = NULL; - } } void BKE_layer_eval_view_layer_indexed( |