diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-03-12 20:58:50 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-03-12 20:58:50 +0400 |
| commit | bce924b43c4c5ff46eec7b340b68f37ae8e15215 (patch) | |
| tree | af0d8bec8f0c2711fb8a3ebd3e6b82c5220f76ec /source/blender/editors/interface/interface_templates.c | |
| parent | 35ed7486c76f11b397d0ff131160f8629af3b49b (diff) | |
HSL color wheel implementation.
This is a standard Hue - Saturation - Lightness model
(see for instance entry on wikipedia here: https://en.wikipedia.org/wiki/HSL_and_HSV)
Note though the difference between HSV and HSL saturation, which are not the same.
The advantage of having this color selection scheme is that artists can select
shades and tints of a color easily by using the lightness slider. Also colors
are arranged on (approximated) perceived lightness on the color wheel.
Beware, Old files opened with this preference saved will crash!
Reviewers: sergey, brecht, campbellbarton
Differential Revision: https://developer.blender.org/D385
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 8ce2a290446..d4d2bc4cebf 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2240,7 +2240,8 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna row = uiLayoutRow(col, true); switch (U.color_picker_type) { - case USER_CP_CIRCLE: + case USER_CP_CIRCLE_HSV: + case USER_CP_CIRCLE_HSL: but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, -1, 0.0, 0.0, 0, 0, ""); break; @@ -2275,11 +2276,16 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna if (value_slider) { switch (U.color_picker_type) { - case USER_CP_CIRCLE: + case USER_CP_CIRCLE_HSV: uiItemS(row); uiDefButR_prop(block, HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop, -1, softmin, softmax, UI_GRAD_V_ALT, 0, ""); break; + case USER_CP_CIRCLE_HSL: + uiItemS(row); + uiDefButR_prop(block, HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop, + -1, softmin, softmax, UI_GRAD_L_ALT, 0, ""); + break; case USER_CP_SQUARE_SV: uiItemS(col); uiDefButR_prop(block, HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop, |