[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27869] trunk/blender/source/blender/ editors/interface: Attempted fixes for color picker trouble (can' t reproduce here..)

[Matt Ebb]

Revision: 27869
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27869
Author:   broken
Date:     2010-03-30 14:43:39 +0200 (Tue, 30 Mar 2010)

Log Message:
-----------
Attempted fixes for color picker trouble (can't reproduce here..)

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-03-30 12:31:04 UTC (rev 27868)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-03-30 12:43:39 UTC (rev 27869)
@@ -2902,8 +2902,7 @@
 		float range;
 		
 		/* vertical 'value' strip */
-		hsv[2]= y; 
-		
+
 		/* exception only for value strip - use the range set in but->min/max */
 		range = but->softmax - but->softmin;
 		hsv[2] = y*range + but->softmin;
@@ -2914,7 +2913,7 @@
 	}
 
 	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
-	ui_set_but_vectorf(but, rgb);
+	copy_v3_v3(data->vec, rgb);
 
 	data->draglastx= mx;
 	data->draglasty= my;

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2010-03-30 12:31:04 UTC (rev 27868)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2010-03-30 12:43:39 UTC (rev 27869)
@@ -1736,11 +1736,11 @@
 	uiBut *bt;
 	
 	/* HS circle */
-	bt= uiDefButR(block, HSVCIRCLE, 0, "",	0, 0, PICKER_H, PICKER_W, ptr, propname, -1, 0.0, 0.0, 0, 0, "");
+	bt= uiDefButR(block, HSVCIRCLE, 0, "",	0, 0, PICKER_H, PICKER_W, ptr, propname, 0, 0.0, 0.0, 0, 0, "");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 	
 	/* value */
-	bt= uiDefButR(block, HSVCUBE, 0, "", PICKER_W+PICKER_SPACE,0,PICKER_BAR,PICKER_H, ptr, propname, -1, 0.0, 0.0, UI_GRAD_V_ALT, 0, "");
+	bt= uiDefButR(block, HSVCUBE, 0, "", PICKER_W+PICKER_SPACE,0,PICKER_BAR,PICKER_H, ptr, propname, 0, 0.0, 0.0, UI_GRAD_V_ALT, 0, "");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 }
 
@@ -1751,11 +1751,11 @@
 	int bartype = type + 3;
 	
 	/* HS square */
-	bt= uiDefButR(block, HSVCUBE, 0, "",	0, PICKER_BAR+PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, propname, -1, 0.0, 0.0, type, 0, "");
+	bt= uiDefButR(block, HSVCUBE, 0, "",	0, PICKER_BAR+PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, propname, 0, 0.0, 0.0, type, 0, "");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 	
 	/* value */
-	bt= uiDefButR(block, HSVCUBE, 0, "",		0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, propname, -1, 0.0, 0.0, bartype, 0, "");
+	bt= uiDefButR(block, HSVCUBE, 0, "",		0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, propname, 0, 0.0, 0.0, bartype, 0, "");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 }