diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-22 06:01:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-22 07:43:23 +0300 |
| commit | 27da43ba86a8160a5bcb52b9d4a214f80800db25 (patch) | |
| tree | 60005fd6aa5b2473b77e4bbfc5d2f93f3e8debd3 /source/blender/editors/interface/interface_intern.h | |
| parent | 00f7dcd5be1fb32a65b5abccc09db6fec775c3cf (diff) | |
UI: refactor color picker flags out of buttons
These are specialized color picker options which don't need to be
stored in the button (frees of flags for buttons too).
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 369a067f7a3..1ca83b929e7 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -341,6 +341,11 @@ typedef struct ColorPicker { /** Initial color data (detect changes). */ float color_data_init[3]; bool is_init; + /** Cubic saturation for the color wheel. */ + bool use_color_cubic; + bool use_color_lock; + bool use_luminosity_lock; + float luminosity_lock_value; } ColorPicker; typedef struct ColorPickerData { @@ -506,8 +511,8 @@ extern void ui_but_v3_set(uiBut *but, const float vec[3]); extern void ui_hsvcircle_vals_from_pos( float *val_rad, float *val_dist, const rcti *rect, const float mx, const float my); -extern void ui_hsvcircle_pos_from_vals(struct uiBut *but, const rcti *rect, float *hsv, float *xpos, float *ypos); -extern void ui_hsvcube_pos_from_vals(struct uiBut *but, const rcti *rect, float *hsv, float *xp, float *yp); +extern void ui_hsvcircle_pos_from_vals(const ColorPicker *cpicker, const rcti *rect, const float *hsv, float *xpos, float *ypos); +extern void ui_hsvcube_pos_from_vals(const struct uiBut *but, const rcti *rect, const float *hsv, float *xp, float *yp); extern void ui_but_string_get_ex( uiBut *but, char *str, const size_t maxlen, |