[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32630] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: bugfix [#24347] Fly mode: Immediately after pressing Shift+F, keys W and S work, keys A, D, R and F do not

[Campbell Barton]

Revision: 32630
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32630
Author:   campbellbarton
Date:     2010-10-21 11:02:21 +0200 (Thu, 21 Oct 2010)

Log Message:
-----------
bugfix [#24347] Fly mode: Immediately after pressing Shift+F, keys W and S work, keys A, D, R and F do not

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-10-21 08:32:53 UTC (rev 32629)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-10-21 09:02:21 UTC (rev 32630)
@@ -2282,33 +2282,35 @@
 				/* impliment WASD keys */
 			case FLY_MODAL_DIR_FORWARD:
 				if (fly->speed < 0.0f) fly->speed= -fly->speed; /* flip speed rather then stopping, game like motion */
-				else fly->speed += fly->grid; /* increse like mousewheel if were already moving in that difection*/
+				else if (fly->axis==2) fly->speed += fly->grid; /* increse like mousewheel if were already moving in that difection*/
 				fly->axis= 2;
 				break;
 			case FLY_MODAL_DIR_BACKWARD:
-				if (fly->speed>0) fly->speed= -fly->speed;
-				else fly->speed -= fly->grid;
+				if (fly->speed > 0.0f) fly->speed= -fly->speed;
+				else if (fly->axis==2) fly->speed -= fly->grid;
 				fly->axis= 2;
 				break;
 			case FLY_MODAL_DIR_LEFT:
 				if (fly->speed < 0.0f) fly->speed= -fly->speed;
+				else if (fly->axis==0) fly->speed += fly->grid;
 				fly->axis= 0;
 				break;
 			case FLY_MODAL_DIR_RIGHT:
 				if (fly->speed > 0.0f) fly->speed= -fly->speed;
+				else if (fly->axis==0) fly->speed -= fly->grid;
 				fly->axis= 0;
 				break;
-
+			case FLY_MODAL_DIR_DOWN:
+				if (fly->speed < 0.0f) fly->speed= -fly->speed;
+				else if (fly->axis==1) fly->speed += fly->grid;
+				fly->axis= 1;
+				break;
 			case FLY_MODAL_DIR_UP:
 				if (fly->speed > 0.0f) fly->speed= -fly->speed;
+				else if (fly->axis==1) fly->speed -= fly->grid;
 				fly->axis= 1;
 				break;
 
-			case FLY_MODAL_DIR_DOWN:
-				if (fly->speed < 0.0f) fly->speed= -fly->speed;
-				fly->axis= 1;
-				break;
-
 			case FLY_MODAL_AXIS_LOCK_X:
 				if (fly->xlock) fly->xlock=0;
 				else {