diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-12 20:27:16 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-12 20:33:28 +0400 |
commit | a2b3c938527aed00a72895f37c634db883d95db9 (patch) | |
tree | b3e1dacb9e8fd57a90e05f282dcc1f4652ca0e43 /source | |
parent | f7d06cdb6b0b7c2e27723af392fd0a04bc2289ac (diff) |
Slight modification to previous color wheel tweak.
Do not use compat version, we do not have a valid previous value really
to use here.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index bb321353955..ab9ea75e5d8 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -479,6 +479,7 @@ float *ui_block_hsv_get(struct uiBlock *block); void ui_popup_block_scrolltest(struct uiBlock *block); void ui_rgb_to_color_picker_compat_v(const float rgb[3], float r_cp[3]); +void ui_rgb_to_color_picker_v(const float rgb[3], float r_cp[3]); void ui_color_picker_to_rgb_v(const float r_cp[3], float rgb[3]); void ui_color_picker_to_rgb(float r_cp0, float r_cp1, float r_cp2, float *r, float *g, float *b); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index b483b8aa2f3..f8466b17b0b 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1994,7 +1994,7 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper uiButSetFunc(bt, do_hex_rna_cb, bt, hexcol); uiDefBut(block, LABEL, 0, IFACE_("(Gamma Corrected)"), 0, yco - UI_UNIT_Y, butwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); - ui_rgb_to_color_picker_compat_v(rgb_gamma, hsv); + ui_rgb_to_color_picker_v(rgb_gamma, hsv); picker_new_hide_reveal(block, colormode); } @@ -2556,6 +2556,18 @@ void ui_rgb_to_color_picker_compat_v(const float rgb[3], float r_cp[3]) } } +void ui_rgb_to_color_picker_v(const float rgb[3], float r_cp[3]) +{ + switch (U.color_picker_type) { + case USER_CP_CIRCLE_HSL: + rgb_to_hsl_v(rgb, r_cp); + break; + default: + rgb_to_hsv_v(rgb, r_cp); + break; + } +} + void ui_color_picker_to_rgb_v(const float r_cp[3], float rgb[3]) { switch (U.color_picker_type) { |