diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-28 16:01:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-28 16:01:02 +0400 |
| commit | 022e72e148ed5376e7c1e52f5eae70890c9f6936 (patch) | |
| tree | 8fd7fafc477cc29a4146a844a0dc478265ff2723 /source/blender/editors | |
| parent | e205a9a1422c73b415be3d2e5bb98979655621ce (diff) | |
bugfix [#24432] HS+V color picker
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 70091a712c6..d3f915cddce 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3006,13 +3006,13 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx, hsv[0]= x; hsv[1]= y; break; - case UI_GRAD_SV + 3: + case UI_GRAD_H: hsv[0]= x; break; - case UI_GRAD_HV + 3: + case UI_GRAD_S: hsv[1]= x; break; - case UI_GRAD_HS + 3: + case UI_GRAD_V: hsv[2]= x; break; case UI_GRAD_V_ALT: diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 644bb50fca4..2a6ab525f89 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1729,7 +1729,7 @@ void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect) void ui_draw_gradient(rcti *rect, float *hsv, int type, float alpha) { int a; - float h= hsv[0], s= hsv[1], v= hsv[0]; + float h= hsv[0], s= hsv[1], v= hsv[2]; float dx, dy, sx1, sx2, sy; float col0[4][3]; // left half, rect bottom to top float col1[4][3]; // right half, rect bottom to top |