diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-09-15 14:22:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-09-15 14:28:21 +0300 |
| commit | 0c2be4d8e853a4c38f073921e9f01a4a7eeae945 (patch) | |
| tree | c5629c2011cec4ceca5935b826f69ac2bdcd8411 /source/blender/editors/interface/interface_widgets.c | |
| parent | 745510844bff2f83d3352b662245a1fad90831ef (diff) | |
Fix T46113: Color picker erratic outside 0-1 range
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b98a29c5b56..369cfaa73a3 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2587,8 +2587,11 @@ static void ui_draw_but_HSV_v(uiBut *but, const rcti *rect) /* map v from property range to [0,1] */ if (but->a1 == UI_GRAD_V_ALT) { - float range = but->softmax - but->softmin; - v = (v - but->softmin) / range; + float min = but->softmin, max = but->softmax; + if (color_profile) { + ui_block_cm_to_display_space_range(but->block, &min, &max); + } + v = (v - min) / (max - min); } widget_init(&wtb); |