[Bf-blender-cvs] [3e1f78a] master: Fix T38302: sequencer animation data lost in original scene when copying scene.

[Brecht Van Lommel]

Commit: 3e1f78a6115390dde78bf53b150d72a930fc4f04
Author: Brecht Van Lommel
Date:   Tue Jan 21 15:15:47 2014 +0100
https://developer.blender.org/rB3e1f78a6115390dde78bf53b150d72a930fc4f04

Fix T38302: sequencer animation data lost in original scene when copying scene.

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 65d1863..ca6ff4d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -219,7 +219,9 @@ Scene *BKE_scene_copy(Scene *sce, int type)
 		BLI_strncpy(scen->sequencer_colorspace_settings.name, sce->sequencer_colorspace_settings.name,
 		            sizeof(scen->sequencer_colorspace_settings.name));
 
-		/* remove animation used by sequencer */
+		/* copy action and remove animation used by sequencer */
+		BKE_copy_animdata_id_action(&scen->id);
+
 		if (type != SCE_COPY_FULL)
 			remove_sequencer_fcurves(scen);
 
@@ -290,7 +292,6 @@ Scene *BKE_scene_copy(Scene *sce, int type)
 
 	/* world */
 	if (type == SCE_COPY_FULL) {
-		BKE_copy_animdata_id_action((ID *)scen);
 		if (scen->world) {
 			id_us_plus((ID *)scen->world);
 			scen->world = BKE_world_copy(scen->world);