[Bf-blender-cvs] [b65eb76] master: Fix T37627: create scene with copy settings did not copy cycles settings.

Brecht Van Lommel noreply at git.blender.org
Tue Nov 26 15:19:54 CET 2013


Commit: b65eb761cc13043d3a9c49f447afc22a11c20d6c
Author: Brecht Van Lommel
Date:   Tue Nov 26 15:19:08 2013 +0100
http://developer.blender.org/rBb65eb761cc13043d3a9c49f447afc22a11c20d6c

Fix T37627: create scene with copy settings did not copy cycles settings.

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index a681363..80fcee1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -163,6 +163,9 @@ Scene *BKE_scene_copy(Scene *sce, int type)
 		scen->gm = sce->gm;
 		scen->audio = sce->audio;
 
+		if (sce->id.properties)
+			scen->id.properties = IDP_CopyProperty(sce->id.properties);
+
 		MEM_freeN(scen->toolsettings);
 	}
 	else {




More information about the Bf-blender-cvs mailing list