[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50708] trunk/blender/source/blender/ blenkernel/intern/scene.c: fix for scene not copying image format color management for settings.
Campbell Barton
ideasman42 at gmail.com
Tue Sep 18 05:14:33 CEST 2012
Revision: 50708
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50708
Author: campbellbarton
Date: 2012-09-18 03:14:31 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
fix for scene not copying image format color management for settings.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/scene.c
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-09-18 01:24:32 UTC (rev 50707)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-09-18 03:14:31 UTC (rev 50708)
@@ -135,8 +135,6 @@
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 @@
}
/* 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 */
More information about the Bf-blender-cvs
mailing list