Commit: 5e56f45a6628fcb3d8077a3cfb152013b450e3d2
Author: Antony Riakiotakis
Date: Thu Mar 13 18:43:04 2014 +0200
https://developer.blender.org/rB5e56f45a6628fcb3d8077a3cfb152013b450e3d2
Fix own bug after HSL picker commit. HSV Cube based pickers missed HSV
buttons.
===================================================================
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 eeb41c8..7dce339 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1920,10 +1920,10 @@ static void uiBlockPicker(uiBlock *block, float
rgba[4], PointerRNA *ptr, Proper
uiBlockBeginAlign(block);
bt = uiDefButS(block, ROW, 0, IFACE_("RGB"), 0, yco, width / 3,
UI_UNIT_Y, &colormode, 0.0, 0.0, 0, 0, "");
uiButSetFunc(bt, do_picker_new_mode_cb, bt, NULL);
- if (U.color_picker_type == USER_CP_CIRCLE_HSV)
- bt = uiDefButS(block, ROW, 0, IFACE_("HSV"), width / 3, yco,
width / 3, UI_UNIT_Y, &colormode, 0.0, 1.0, 0, 0, "");
- else if (U.color_picker_type == USER_CP_CIRCLE_HSL)
+ if (U.color_picker_type == USER_CP_CIRCLE_HSL)
bt = uiDefButS(block, ROW, 0, IFACE_("HSL"), width / 3, yco,
width / 3, UI_UNIT_Y, &colormode, 0.0, 1.0, 0, 0, "");
+ else
+ bt = uiDefButS(block, ROW, 0, IFACE_("HSV"), width / 3, yco,
width / 3, UI_UNIT_Y, &colormode, 0.0, 1.0, 0, 0, "");
uiButSetFunc(bt, do_picker_new_mode_cb, bt, NULL);
bt = uiDefButS(block, ROW, 0, IFACE_("Hex"), 2 * width / 3, yco, width
/ 3, UI_UNIT_Y, &colormode, 0.0, 2.0, 0, 0, "");
uiButSetFunc(bt, do_picker_new_mode_cb, bt, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
