[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53132] trunk/blender/source/blender/ editors: make sure color picker and color swatch buttons have rnaindex of -1.

[Campbell Barton]

Revision: 53132
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53132
Author:   campbellbarton
Date:     2012-12-18 17:00:49 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
make sure color picker and color swatch buttons have rnaindex of -1.
Some were 0 some -1, but this messed up reporting - making it think that only red was being changed for each button.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/interface/interface_utils.c
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/editors/space_node/drawnode.c

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2012-12-18 16:52:46 UTC (rev 53131)
+++ trunk/blender/source/blender/editors/interface/interface.c	2012-12-18 17:00:49 UTC (rev 53132)
@@ -2787,6 +2787,10 @@
 	uiBut *but;
 	int freestr = 0, icon = 0;
 
+	if (ELEM3(type, COLOR, HSVCIRCLE, HSVCUBE)) {
+		BLI_assert(index == -1);
+	}
+
 	/* use rna values if parameters are not specified */
 	if (!str) {
 		if (type == MENU && proptype == PROP_ENUM) {

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2012-12-18 16:52:46 UTC (rev 53131)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2012-12-18 17:00:49 UTC (rev 53132)
@@ -2037,11 +2037,11 @@
 	uiBut *bt;
 	
 	/* HS circle */
-	bt = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, prop, 0, 0.0, 0.0, 0, 0, "Color");
+	bt = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, prop, -1, 0.0, 0.0, 0, 0, "Color");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 	
 	/* value */
-	bt = uiDefButR_prop(block, HSVCUBE, 0, "", PICKER_W + PICKER_SPACE, 0, PICKER_BAR, PICKER_H, ptr, prop, 0, 0.0, 0.0, UI_GRAD_V_ALT, 0, "Value");
+	bt = uiDefButR_prop(block, HSVCUBE, 0, "", PICKER_W + PICKER_SPACE, 0, PICKER_BAR, PICKER_H, ptr, prop, -1, 0.0, 0.0, UI_GRAD_V_ALT, 0, "Value");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 }
 
@@ -2052,11 +2052,11 @@
 	int bartype = type + 3;
 	
 	/* HS square */
-	bt = uiDefButR_prop(block, HSVCUBE, 0, "",   0, PICKER_BAR + PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, prop, 0, 0.0, 0.0, type, 0, "Color");
+	bt = uiDefButR_prop(block, HSVCUBE, 0, "",   0, PICKER_BAR + PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, prop, -1, 0.0, 0.0, type, 0, "Color");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 	
 	/* value */
-	bt = uiDefButR_prop(block, HSVCUBE, 0, "",       0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, prop, 0, 0.0, 0.0, bartype, 0, "Value");
+	bt = uiDefButR_prop(block, HSVCUBE, 0, "",       0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, prop, -1, 0.0, 0.0, bartype, 0, "Value");
 	uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 }
 

Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c	2012-12-18 16:52:46 UTC (rev 53131)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c	2012-12-18 17:00:49 UTC (rev 53132)
@@ -78,7 +78,7 @@
 
 			if (arraylen && index == -1) {
 				if (ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA))
-					but = uiDefButR_prop(block, COLOR, 0, name, x1, y1, x2, y2, ptr, prop, 0, 0, 0, -1, -1, NULL);
+					but = uiDefButR_prop(block, COLOR, 0, name, x1, y1, x2, y2, ptr, prop, -1, 0, 0, -1, -1, NULL);
 			}
 			else if (RNA_property_subtype(prop) == PROP_PERCENTAGE || RNA_property_subtype(prop) == PROP_FACTOR)
 				but = uiDefButR_prop(block, NUMSLI, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-18 16:52:46 UTC (rev 53131)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-18 17:00:49 UTC (rev 53132)
@@ -2588,6 +2588,8 @@
 	col[3] = 1.0f;
 
 	if (but->rnaprop) {
+		BLI_assert(but->rnaindex == -1);
+
 		if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA)
 			color_profile = FALSE;
 

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-12-18 16:52:46 UTC (rev 53131)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-12-18 17:00:49 UTC (rev 53132)
@@ -208,7 +208,7 @@
 		
 		bt = uiDefButR(block, COLOR, B_NODE_EXEC, "",
 		               x, y + 2, (labelw > 0 ? 40 : width), NODE_DY - 2,
-		               &ptr, "default_value", 0, 0, 0, -1, -1, NULL);
+		               &ptr, "default_value", -1, 0, 0, -1, -1, NULL);
 		if (node)
 			uiButSetFunc(bt, node_sync_cb, CTX_wm_space_node(C), node);