diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-21 18:15:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-21 18:17:35 +0400 |
| commit | 3e1f78a6115390dde78bf53b150d72a930fc4f04 (patch) | |
| tree | 702e5a1dfb0715a9dbe2f604ee3e9364046cf5f2 /source/blender/blenkernel/intern/scene.c | |
| parent | 45b9822259475fa6f738ca3d0f07f41bfa03b3f9 (diff) | |
Fix T38302: sequencer animation data lost in original scene when copying scene.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 65d1863873c..ca6ff4dc1e5 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); |