[Bf-blender-cvs] [9d4a8cbd887] master: 2nd attempt to fix build error from rB22bdd08dfd08

Philipp Oeser noreply at git.blender.org
Thu Aug 8 10:45:04 CEST 2019


Commit: 9d4a8cbd887f03bf1acfaae5e8e3342f3c7ed040
Author: Philipp Oeser
Date:   Thu Aug 8 10:44:32 2019 +0200
Branches: master
https://developer.blender.org/rB9d4a8cbd887f03bf1acfaae5e8e3342f3c7ed040

2nd attempt to fix build error from rB22bdd08dfd08

sorry for the noise, if that doesnt do it, I'll revert and check this
thoroughly...

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

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 b2189d8ae0b..3e2e113be3e 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -189,7 +189,7 @@ typedef struct FlyInfo {
 
 /* prototypes */
 #ifdef WITH_INPUT_NDOF
-static void flyApply_ndof(bContext *C, FlyInfo *fly, bool is_confirm)
+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);
 
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 4c84398f8d9..22c1aafd7c4 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -265,7 +265,7 @@ typedef struct WalkInfo {
 
 /* prototypes */
 #ifdef WITH_INPUT_NDOF
-static void walkApply_ndof(bContext *C, WalkInfo *walk, bool is_confirm)
+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);



More information about the Bf-blender-cvs mailing list