[Bf-blender-cvs] [13c1f29d88b] temp-group-collections: Preserve the original overrides from collection to group

[Dalai Felinto]

Commit: 13c1f29d88b9f7e56b3b80c5ef11ce68efd4e9dd
Author: Dalai Felinto
Date:   Tue Oct 31 20:05:27 2017 -0200
Branches: temp-group-collections
https://developer.blender.org/rB13c1f29d88b9f7e56b3b80c5ef11ce68efd4e9dd

Preserve the original overrides from collection to group

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

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

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index d60791151fc..e1b520317a3 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -466,10 +466,9 @@ static void collection_group_convert_layer_collections(const Group *group, Scene
 static void layer_collection_sync(LayerCollection *lc_dst, LayerCollection *lc_src)
 {
 	lc_dst->flag = lc_src->flag;
-	lc_dst->flag_evaluated = lc_src->flag_evaluated;
 
 	/* Pending: sync overrides. */
-	TODO_LAYER_OVERRIDE;
+	IDP_MergeGroup(lc_dst->properties, lc_src->properties, true);
 
 	/* Continue recursively. */
 	LayerCollection *lc_dst_nested, *lc_src_nested;