[Bf-blender-cvs] [7227117] master: Fix own bug reported on irc by Venomgfx, missing value slider in color pickers.

[Antony Riakiotakis]

Commit: 7227117bed952eda1146ad52493f45bb80bb79ee
Author: Antony Riakiotakis
Date:   Mon Mar 17 20:01:33 2014 +0200
https://developer.blender.org/rB7227117bed952eda1146ad52493f45bb80bb79ee

Fix own bug reported on irc by Venomgfx, missing value slider in color
pickers.

===================================================================

M	source/blender/editors/interface/interface_regions.c

===================================================================

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 7dce339..cd483ad 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1954,10 +1954,10 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper
 	uiButSetFunc(bt, do_color_wheel_rna_cb, bt, hsv);
 	bt = uiDefButF(block, NUMSLI, 0, IFACE_("S:"),   0, yco -= UI_UNIT_Y, butwidth, UI_UNIT_Y, hsv + 1, 0.0, 1.0, 10, 3, TIP_("Saturation"));
 	uiButSetFunc(bt, do_color_wheel_rna_cb, bt, hsv);
-	if (U.color_picker_type == USER_CP_CIRCLE_HSV)
-		bt = uiDefButF(block, NUMSLI, 0, IFACE_("V:"),   0, yco -= UI_UNIT_Y, butwidth, UI_UNIT_Y, hsv + 2, 0.0, softmax, 10, 3, TIP_("Value"));
-	else if (U.color_picker_type == USER_CP_CIRCLE_HSL)
+	if (U.color_picker_type == USER_CP_CIRCLE_HSL)
 		bt = uiDefButF(block, NUMSLI, 0, IFACE_("L:"),   0, yco -= UI_UNIT_Y, butwidth, UI_UNIT_Y, hsv + 2, 0.0, softmax, 10, 3, TIP_("Lightness"));
+	else
+		bt = uiDefButF(block, NUMSLI, 0, IFACE_("V:"),   0, yco -= UI_UNIT_Y, butwidth, UI_UNIT_Y, hsv + 2, 0.0, softmax, 10, 3, TIP_("Value"));
 
 	bt->hardmax = hardmax;  /* not common but rgb  may be over 1.0 */
 	uiButSetFunc(bt, do_color_wheel_rna_cb, bt, hsv);