[Bf-blender-cvs] [6689614e39b] master: attempt to fix build error from rB22bdd08dfd08

[Philipp Oeser]

Commit: 6689614e39b6ceab00fb0ef59ece74b1659facbf
Author: Philipp Oeser
Date:   Thu Aug 8 10:38:01 2019 +0200
Branches: master
https://developer.blender.org/rB6689614e39b6ceab00fb0ef59ece74b1659facbf

attempt to fix build error from rB22bdd08dfd08

===================================================================

M	source/blender/editors/space_view3d/view3d_fly.c
M	source/blender/editors/space_view3d/view3d_walk.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index a0b2cdc0e3b..b2189d8ae0b 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -188,6 +188,9 @@ typedef struct FlyInfo {
 } FlyInfo;
 
 /* prototypes */
+#ifdef WITH_INPUT_NDOF
+static void flyApply_ndof(bContext *C, FlyInfo *fly, bool is_confirm)
+#endif /* WITH_INPUT_NDOF */
 static int flyApply(bContext *C, struct FlyInfo *fly, bool force_autokey);
 
 static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar), void *arg)
@@ -989,7 +992,7 @@ static int flyApply(bContext *C, FlyInfo *fly, bool is_confirm)
 }
 
 #ifdef WITH_INPUT_NDOF
-static void flyApply_ndof(bContext *C, FlyInfo *fly)
+static void flyApply_ndof(bContext *C, FlyInfo *fly, bool is_confirm)
 {
   Object *lock_ob = ED_view3d_cameracontrol_object_get(fly->v3d_camera_control);
   bool has_translate, has_rotate;
@@ -1006,7 +1009,7 @@ static void flyApply_ndof(bContext *C, FlyInfo *fly)
     fly->redraw = true;
 
     if (fly->rv3d->persp == RV3D_CAMOB) {
-      flyMoveCamera(C, fly, has_rotate, has_translate, true);
+      flyMoveCamera(C, fly, has_rotate, has_translate, is_confirm);
     }
   }
 }
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index fb445198ccf..4c84398f8d9 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -264,6 +264,9 @@ typedef struct WalkInfo {
 } WalkInfo;
 
 /* prototypes */
+#ifdef WITH_INPUT_NDOF
+static void walkApply_ndof(bContext *C, WalkInfo *walk, bool is_confirm)
+#endif /* WITH_INPUT_NDOF */
 static int walkApply(bContext *C, struct WalkInfo *walk, bool force_autokey);
 static float getVelocityZeroTime(const float gravity, const float velocity);
 
@@ -1284,7 +1287,7 @@ static int walkApply(bContext *C, WalkInfo *walk, bool is_confirm)
 }
 
 #ifdef WITH_INPUT_NDOF
-static void walkApply_ndof(bContext *C, WalkInfo *walk)
+static void walkApply_ndof(bContext *C, WalkInfo *walk, bool is_confirm)
 {
   Object *lock_ob = ED_view3d_cameracontrol_object_get(walk->v3d_camera_control);
   bool has_translate, has_rotate;
@@ -1301,7 +1304,7 @@ static void walkApply_ndof(bContext *C, WalkInfo *walk)
     walk->redraw = true;
 
     if (walk->rv3d->persp == RV3D_CAMOB) {
-      walkMoveCamera(C, walk, has_rotate, has_translate, true);
+      walkMoveCamera(C, walk, has_rotate, has_translate, is_confirm);
     }
   }
 }