diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-06-12 18:22:27 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-06-12 18:22:27 +0400 |
| commit | a62bec6667c7ae0df7d0003b566a466b1047d728 (patch) | |
| tree | 40e2baf1b662083d27a0f2dc5ccee310594a4ee0 /source/blender/editors/interface/interface.c | |
| parent | 32b34f82fd782d45ee4b5389a1f961bc1f463631 (diff) | |
2.5
Quick Color picker alternative!
- only a color circle + value slider
- exits immediate after use, or slight mouse move outside picker
- use scrollwheel to change HSV 'value'. Also works while picking.
- added nicer AA'ed cursor in picker
- All color swatches change 'value' on ALT+Wheel mouse-over
Old picker is still there, under SHIFT+click on swatch. Needs
evaluation... part of UI keymap? Per button type? Or divide
picker in left/right? Or just have all those old picker buttons
in another panel... I'm not to fond of this giant old popup.
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 79e32d4a5f1..e37f7d2158c 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2232,7 +2232,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short } } - if(but->type==HSVCUBE) { /* hsv buttons temp storage */ + if(ELEM(but->type, HSVCUBE, HSVCIRCLE)) { /* hsv buttons temp storage */ float rgb[3]; ui_get_but_vectorf(but, rgb); rgb_to_hsv(rgb[0], rgb[1], rgb[2], but->hsv, but->hsv+1, but->hsv+2); |