diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 07:14:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 07:14:31 +0400 |
commit | 7a06630411be281c775136cddad1efc745e9f2e0 (patch) | |
tree | faf6dae64d064b2ac3e23aebf10f6ddc18ce845a /source | |
parent | 47677909c76bbf01aa497c192bdad5fcbc94cea8 (diff) |
fix for scene not copying image format color management for settings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 2dec72560a2..758e348c073 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -135,8 +135,6 @@ Scene *BKE_scene_copy(Scene *sce, int type) MEM_freeN(scen->toolsettings); } else { - ImageFormatData *im_format, *im_formatn; - scen = BKE_libblock_copy(&sce->id); BLI_duplicatelist(&(scen->base), &(sce->base)); @@ -174,11 +172,9 @@ Scene *BKE_scene_copy(Scene *sce, int type) } /* copy color management settings */ - im_format = &sce->r.im_format; - im_formatn = &scen->r.im_format; - BKE_color_managed_display_settings_copy(&scen->display_settings, &sce->display_settings); BKE_color_managed_view_settings_copy(&scen->view_settings, &sce->view_settings); + BKE_color_managed_view_settings_copy(&scen->r.im_format.view_settings, &sce->r.im_format.view_settings); } /* tool settings */ |