Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_view3d / view3d_fly.c
index 56e90c7..d8cc9ab 100644 (file)
@@ -151,7 +151,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
        WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_DECELERATE);
 
        WM_modalkeymap_add_item(keymap, MOUSEPAN, 0, 0, 0, FLY_MODAL_SPEED);
-       
+
        WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_PRESS, KM_ANY, 0, FLY_MODAL_PAN_ENABLE);
        /* XXX - Bug in the event system, middle mouse release doesnt work */
        WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PAN_DISABLE);
@@ -550,12 +550,12 @@ static void flyEvent(bContext *C, wmOperator *op, FlyInfo *fly, const wmEvent *e
                        case FLY_MODAL_CONFIRM:
                                fly->state = FLY_CONFIRM;
                                break;
-                               
+
                        /* speed adjusting with mousepan (trackpad) */
                        case FLY_MODAL_SPEED:
                        {
                                float fac = 0.02f * (event->prevy - event->y);
-                               
+
                                /* allowing to brake immediate */
                                if (fac > 0.0f && fly->speed < 0.0f)
                                        fly->speed = 0.0f;
@@ -563,7 +563,7 @@ static void flyEvent(bContext *C, wmOperator *op, FlyInfo *fly, const wmEvent *e
                                        fly->speed = 0.0f;
                                else
                                        fly->speed += fly->grid * fac;
-                               
+
                                break;
                        }
                        case FLY_MODAL_ACCELERATE: