[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27346] trunk/blender/source/blender/ editors/interface/interface_ops.c: Fix [#21047] Sample color too dark when not using color managment

[Matt Ebb]

Revision: 27346
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27346
Author:   broken
Date:     2010-03-09 03:29:59 +0100 (Tue, 09 Mar 2010)

Log Message:
-----------
Fix [#21047] Sample color too dark when not using color managment

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2010-03-09 01:25:15 UTC (rev 27345)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2010-03-09 02:29:59 UTC (rev 27346)
@@ -94,6 +94,7 @@
 
 static void eyedropper_sample(bContext *C, Eyedropper *eye, short mx, short my)
 {
+	const int color_manage = CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT;
 	float col[3];
 		
 	glReadBuffer(GL_FRONT);
@@ -101,11 +102,11 @@
 	glReadBuffer(GL_BACK);
 	
 	if(RNA_property_type(eye->prop) == PROP_FLOAT) {
-
+		
 		if (RNA_property_array_length(&eye->ptr, eye->prop) < 3) return;
 
 		/* convert from screen (srgb) space to linear rgb space */
-		if (RNA_property_subtype(eye->prop) == PROP_COLOR)
+		if (color_manage && RNA_property_subtype(eye->prop) == PROP_COLOR)
 			srgb_to_linearrgb_v3_v3(col, col);
 		
 		RNA_property_float_set_array(&eye->ptr, eye->prop, col);