[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32752] trunk/blender/source/blender/ editors/interface: bugfix [#24432] HS+V color picker

Campbell Barton ideasman42 at gmail.com
Thu Oct 28 14:01:02 CEST 2010


Revision: 32752
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32752
Author:   campbellbarton
Date:     2010-10-28 14:01:02 +0200 (Thu, 28 Oct 2010)

Log Message:
-----------
bugfix [#24432] HS+V color picker

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-10-28 11:49:56 UTC (rev 32751)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-10-28 12:01:02 UTC (rev 32752)
@@ -3006,13 +3006,13 @@
 		hsv[0]= x;
 		hsv[1]= y;
 		break;
-	case UI_GRAD_SV + 3:
+	case UI_GRAD_H:
 		hsv[0]= x;
 		break;
-	case UI_GRAD_HV + 3:
+	case UI_GRAD_S:
 		hsv[1]= x;
 		break;
-	case UI_GRAD_HS + 3:
+	case UI_GRAD_V:
 		hsv[2]= x;
 		break;
 	case UI_GRAD_V_ALT:	

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-10-28 11:49:56 UTC (rev 32751)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-10-28 12:01:02 UTC (rev 32752)
@@ -1729,7 +1729,7 @@
 void ui_draw_gradient(rcti *rect, float *hsv, int type, float alpha)
 {
 	int a;
-	float h= hsv[0], s= hsv[1], v= hsv[0];
+	float h= hsv[0], s= hsv[1], v= hsv[2];
 	float dx, dy, sx1, sx2, sy;
 	float col0[4][3];	// left half, rect bottom to top
 	float col1[4][3];	// right half, rect bottom to top





More information about the Bf-blender-cvs mailing list