diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 5912bea4919..ab08c9a804a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -284,7 +284,7 @@ static void viewops_data_alloc(bContext *C, wmOperator *op) } void view3d_orbit_apply_dyn_ofs(float r_ofs[3], - const float ofs_init[3], + const float ofs_old[3], const float viewquat_old[4], const float viewquat_new[4], const float dyn_ofs[3]) @@ -295,7 +295,7 @@ void view3d_orbit_apply_dyn_ofs(float r_ofs[3], invert_qt_normalized(q); - sub_v3_v3v3(r_ofs, ofs_init, dyn_ofs); + sub_v3_v3v3(r_ofs, ofs_old, dyn_ofs); mul_qt_v3(q, r_ofs); add_v3_v3(r_ofs, dyn_ofs); } diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 556b5d51505..6ce76c478df 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -229,7 +229,7 @@ typedef struct FlyInfo { #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 int flyApply(bContext *C, struct FlyInfo *fly, bool is_confirm); static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(region), void *arg) { diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index c790a8659ee..e073cb43962 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -73,13 +73,13 @@ void ED_view3d_project_float_v2_m4(const ARegion *region, * \note use #ED_view3d_ob_project_mat_get to get projecting mat */ void ED_view3d_project_float_v3_m4(const ARegion *region, - const float vec[3], + const float co[3], float r_co[3], float mat[4][4]) { float vec4[4]; - copy_v3_v3(vec4, vec); + copy_v3_v3(vec4, co); vec4[3] = 1.0; /* r_co[0] = IS_CLIPPED; */ /* always overwritten */ diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index 2fb44c29d2e..ef389918eb4 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -308,7 +308,7 @@ typedef struct WalkInfo { #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 int walkApply(bContext *C, struct WalkInfo *walk, bool is_confirm); static float getVelocityZeroTime(const float gravity, const float velocity); static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *region, void *arg) |