diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-07 22:29:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-07 22:29:21 +0400 |
| commit | b245dfbc06feec5b73df23e55df21ef404feacd3 (patch) | |
| tree | 1a04addb2909c27827f42339d91a9bba22fb2677 /source/blender/windowmanager/intern/wm_gesture.c | |
| parent | 2a35e8f9c140d082c6292efcf5b05f52aee6c95e (diff) | |
| parent | 3637794436b6a37ae9447adbd9baaccc0add0823 (diff) | |
svn merge ^/trunk/blender -r42466:42495
Diffstat (limited to 'source/blender/windowmanager/intern/wm_gesture.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 56f8909ca8f..6940764c6ad 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -124,14 +124,13 @@ void WM_gestures_remove(bContext *C) /* tweak and line gestures */ -#define TWEAK_THRESHOLD 10 int wm_gesture_evaluate(wmGesture *gesture) { if(gesture->type==WM_GESTURE_TWEAK) { rcti *rect= gesture->customdata; int dx= rect->xmax - rect->xmin; int dy= rect->ymax - rect->ymin; - if(ABS(dx)+ABS(dy) > TWEAK_THRESHOLD) { + if(ABS(dx)+ABS(dy) > U.tweak_threshold) { int theta= (int)floor(4.0f*atan2f((float)dy, (float)dx)/(float)M_PI + 0.5f); int val= EVT_GESTURE_W; |