[Bf-blender-cvs] [8534ce93842] blender2.8: Revert "Objects: when active object gets hidden, make it inactive."

Brecht Van Lommel noreply at git.blender.org
Thu Jun 21 15:09:20 CEST 2018


Commit: 8534ce93842d848e726e71aead33c77ef975f9bb
Author: Brecht Van Lommel
Date:   Thu Jun 21 14:42:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8534ce93842d848e726e71aead33c77ef975f9bb

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.

===================================================================

M	source/blender/blenkernel/intern/layer.c

===================================================================

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(



More information about the Bf-blender-cvs mailing list