[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53038] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Bugfix, IRC submitted:

[Ton Roosendaal]

Revision: 53038
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53038
Author:   ton
Date:     2012-12-15 18:12:38 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Bugfix, IRC submitted:

Color Pickers, square versions, didn't draw the 'cursor' correctly.
Was missing colorprofile check.

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

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-15 17:15:42 UTC (rev 53037)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-15 18:12:38 UTC (rev 53038)
@@ -2141,10 +2141,18 @@
 	float x = 0.0f, y = 0.0f;
 	float *hsv = ui_block_hsv_get(but->block);
 	float hsv_n[3];
+	int color_profile = but->block->color_profile;
 	
+	if (but->rnaprop && RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
+		color_profile = FALSE;
+	
 	copy_v3_v3(hsv_n, hsv);
 	
 	ui_get_but_vectorf(but, rgb);
+	
+	if (color_profile && (int)but->a1 != UI_GRAD_SV)
+		ui_block_to_display_space_v3(but->block, rgb);
+	
 	rgb_to_hsv_compat_v(rgb, hsv_n);
 	
 	ui_draw_gradient(rect, hsv_n, but->a1, 1.0f);