[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50980] trunk/blender/source/blender/ editors/render/render_preview.c: Disable render part of display transformation for icon/texture preview

[Sergey Sharybin]

Revision: 50980
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50980
Author:   nazgul
Date:     2012-10-01 12:41:20 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Disable render part of display transformation for icon/texture preview

This change mainly caused by too dark icon generated for texture brushes,
but also makes it a bit more straightforward from what's going on point of view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2012-10-01 11:26:52 UTC (rev 50979)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2012-10-01 12:41:20 UTC (rev 50980)
@@ -271,9 +271,19 @@
 		else
 			sce->r.xparts = sce->r.yparts = 4;
 		
-		/* exception: don't color manage texture previews or icons */
-		if ((id && sp->pr_method == PR_ICON_RENDER) || id_type == ID_TE)
-			BKE_scene_disable_color_management(sce);
+		/* exception: don't apply render part of display transform for texture previews or icons */
+		if ((id && sp->pr_method == PR_ICON_RENDER) || id_type == ID_TE) {
+			ColorManagedDisplaySettings *display_settings = &sce->display_settings;
+			ColorManagedViewSettings *view_settings = &sce->view_settings;
+
+			const char *default_view_name = IMB_colormanagement_view_get_default_name(display_settings->display_device);
+
+			view_settings->exposure = 0.0f;
+			view_settings->gamma = 1.0f;
+			view_settings->flag &= ~COLORMANAGE_VIEW_USE_CURVES;
+
+			BLI_strncpy(view_settings->view_transform, default_view_name, sizeof(view_settings->view_transform));
+		}
 		
 		if ((id && sp->pr_method == PR_ICON_RENDER) && id_type != ID_WO)
 			sce->r.alphamode = R_ALPHAPREMUL;