diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
commit | 51488283564273c5e796d5ca3ded47f2726330e8 (patch) | |
tree | a6149b89048c7827e7f762e469050dd8d94e7d50 /source/blender/windowmanager/intern/wm_gesture.c | |
parent | 85d99737b5753fd845c3fce0f08e6b5205530195 (diff) | |
parent | 5cd85ed57ea649c58c7c19d709bfc4cae7fffcad (diff) |
svn merge ^/trunk/blender -r44235:44250
Diffstat (limited to 'source/blender/windowmanager/intern/wm_gesture.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 6940764c6ad..c97d2b58596 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -74,7 +74,9 @@ wmGesture *WM_gesture_new(bContext *C, wmEvent *event, int type) wm_subwindow_getorigin(window, gesture->swinid, &sx, &sy); - if( ELEM5(type, WM_GESTURE_RECT, WM_GESTURE_CROSS_RECT, WM_GESTURE_TWEAK, WM_GESTURE_CIRCLE, WM_GESTURE_STRAIGHTLINE)) { + if (ELEM5(type, WM_GESTURE_RECT, WM_GESTURE_CROSS_RECT, WM_GESTURE_TWEAK, + WM_GESTURE_CIRCLE, WM_GESTURE_STRAIGHTLINE)) + { rcti *rect= MEM_callocN(sizeof(rcti), "gesture rect new"); gesture->customdata= rect; |