diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-05 19:52:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-05 19:52:25 +0400 |
| commit | deb7402299a2ddbbbb2f5f52b744caacb49e0d41 (patch) | |
| tree | 651b696d60e0a34c7c5935f2971ee268559ea86b /source/blender/editors/interface/interface_widgets.c | |
| parent | aea7ea5b30cc5434f0b747ead8d2947d91a28964 (diff) | |
option for color wheel widget to make it easier to select values closer to white, enable for color balance.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 5bebf71167d..d2860adbf50 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1675,6 +1675,7 @@ void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect) ui_hsvcircle_vals_from_pos(hsv, hsv+1, rect, centx + co*radius, centy + si*radius); CLAMP(hsv[2], 0.0f, 1.0f); /* for display only */ + hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col+1, col+2); glColor3fv(col); glVertex2f( centx + co*radius, centy + si*radius); @@ -1696,7 +1697,12 @@ void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect) /* cursor */ ang= 2.0f*M_PI*hsvo[0] + 0.5f*M_PI; - radius= hsvo[1]*radius; + + if(but->flag & UI_BUT_COLOR_CUBIC) + radius= (1.0f - pow(1.0f - hsvo[1], 3.0f)) *radius; + else + radius= hsvo[1] * radius; + ui_hsv_cursor(centx + cos(-ang)*radius, centy + sin(-ang)*radius); } |