[Bf-blender-cvs] [2b55a1da50d] master: Fix T70499: Can't change Brush Texture Rotation without holding the Shift key.
Pablo Dobarro
noreply at git.blender.org
Fri Oct 4 15:23:15 CEST 2019
Commit: 2b55a1da50d213b34993a00b6b4459970e82a5aa
Author: Pablo Dobarro
Date: Thu Oct 3 23:26:05 2019 +0200
Branches: master
https://developer.blender.org/rB2b55a1da50d213b34993a00b6b4459970e82a5aa
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
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
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 */
More information about the Bf-blender-cvs
mailing list