diff options
author | Pablo Dobarro <pablodp606@gmail.com> | 2019-10-04 00:26:05 +0300 |
---|---|---|
committer | Pablo Dobarro <pablodp606@gmail.com> | 2019-10-04 16:24:40 +0300 |
commit | 2b55a1da50d213b34993a00b6b4459970e82a5aa (patch) | |
tree | 07dcca1bcbe2650b44daff33c8825e7af0542e73 | |
parent | 8afa93d82d7dd2519af667d85e1d87b19bf6f2c5 (diff) |
Fix T70499: Can't change Brush Texture Rotation without holding the Shift key.
Reviewed By: brecht
Maniphest Tasks: T70499
Differential Revision: https://developer.blender.org/D5985
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 69c535308e6..97771d40b2c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2641,14 +2641,18 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even } else { delta[0] = rc->initial_mouse[0] - event->x; - delta[1] = 0.0f; - + delta[1] = rc->initial_mouse[1] - event->y; if (rc->zoom_prop) { RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom); delta[0] /= zoom[0]; + delta[1] /= zoom[1]; + } + if (rc->subtype == PROP_ANGLE) { + dist = len_v2(delta); + } + else { + dist = clamp_f(-delta[0], 0.0f, FLT_MAX); } - - dist = clamp_f(-delta[0], 0.0f, FLT_MAX); } /* calculate new value and apply snapping */ |