Depsgraph: Correct wrong base_flags for objects coming from set scene

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 85f207509c2..2c0ff76d0e6 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -423,7 +423,7 @@ void BKE_object_data_select_update(const EvaluationContext *UNUSED(eval_ctx),
 }
 
 void BKE_object_eval_flush_base_flags(const EvaluationContext *UNUSED(eval_ctx),
-                                      Object *object, Base *base)
+                                      Object *object, Base *base, bool is_from_set)
 {
 	/* Make sure we have the base collection settings is already populated.
 	 * This will fail when BKE_layer_eval_layer_collection_pre hasn't run yet
@@ -431,5 +431,9 @@ void BKE_object_eval_flush_base_flags(const EvaluationContext *UNUSED(eval_ctx),
 	BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group));
 	/* Copy flags and settings from base. */
 	object->base_flag = base->flag;
+	if (is_from_set) {
+		object->base_flag |= BASE_FROM_SET;
+		object->base_flag &= ~(BASE_SELECTED | BASE_SELECTABLED);
+	}
 	object->base_collection_properties = base->collection_properties;
 }