[Bf-blender-cvs] [86aaa3efba7] blender2.8: Fix T55126: COW problem: there is an active object even if unselectable

[Sergey Sharybin]

Commit: 86aaa3efba7c129378649394da8a5134076eddfe
Author: Sergey Sharybin
Date:   Thu Jun 7 16:30:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB86aaa3efba7c129378649394da8a5134076eddfe

Fix T55126: COW problem: there is an active object even if unselectable

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

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

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 16e349465f6..c7bb24cdcee 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1264,6 +1264,16 @@ void BKE_layer_eval_view_layer(
 		/* Store base in the array. */
 		view_layer->object_bases_array[base_index++] = base;
 	}
+	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) {
+			base_orig->flag = base_eval->flag;
+			base_orig = base_orig->next;
+			base_eval = base_eval->next;
+		}
+	}
 }
 
 void BKE_layer_eval_view_layer_indexed(
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 852d8197a6c..3b684ebfd94 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -145,6 +145,7 @@ void BKE_object_eval_done(Depsgraph *depsgraph, Object *ob)
 		Object *ob_orig = DEG_get_original_object(ob);
 		copy_m4_m4(ob_orig->obmat, ob->obmat);
 		ob_orig->transflag = ob->transflag;
+		ob_orig->flag = ob->flag;
 	}
 }