diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
commit | 43ce201125ff97e16a56b372a91442590498dacc (patch) | |
tree | 10b6ef3c41cab5b9cef0b93d99de0a14fca4157f /source/blender/editors/interface/interface_widgets.c | |
parent | 75188552a113f4dc226f21076f883ac3c11c9a98 (diff) | |
parent | 42103a3eb8e9ee341c89310cc2343bc21b6ae7e2 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index c39e2f8a771..4bc3aaaf842 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2825,7 +2825,7 @@ void ui_hsvcircle_pos_from_vals(uiBut *but, const rcti *rect, float *hsv, float else radius_t = hsv[1]; - radius = CLAMPIS(radius_t, 0.0f, 1.0f) * radius; + radius = clamp_f(radius_t, 0.0f, 1.0f) * radius; *xpos = centx + cosf(-ang) * radius; *ypos = centy + sinf(-ang) * radius; } |