[Bf-blender-cvs] [cd21236ea1d] blender2.8: Fix duplication of scene, it was missing duplication of layer properties

Dalai Felinto noreply at git.blender.org
Thu Jun 15 18:37:09 CEST 2017


Commit: cd21236ea1d1fcd0bef579375a9de67b114b591f
Author: Dalai Felinto
Date:   Thu Jun 15 18:31:30 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBcd21236ea1d1fcd0bef579375a9de67b114b591f

Fix duplication of scene, it was missing duplication of layer properties

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index ad00ba909b4..f54a02f033a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -318,8 +318,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 		SceneLayer *new_sl = scen->render_layers.first;
 		for (SceneLayer *sl = sce->render_layers.first; sl; sl = sl->next) {
 			new_sl->stats = NULL;
-			new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
 			new_sl->properties_evaluated = NULL;
+			new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
+			IDP_MergeGroup(new_sl->properties, sl->properties, true);
 
 			/* we start fresh with no overrides and no visibility flags set
 			 * instead of syncing both trees we simply unlink and relink the scene collection */




More information about the Bf-blender-cvs mailing list