blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

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.
This commit is contained in:
Brecht Van Lommel 2018-06-21 14:42:57 +02:00
parent c054a1a848
commit 8534ce9384
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/layer.c
View File

@ -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(