sub_v3_v3v3 --> sub_v3_v3 (where possible)

4 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index a5598dc9d0c..c7a174626a0 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -542,7 +542,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y)
 
 			conjugate_qt(q1); /* conj == inv for unit quat */
 			VECCOPY(rv3d->ofs, vod->ofs);
-			sub_v3_v3v3(rv3d->ofs, rv3d->ofs, vod->dyn_ofs);
+			sub_v3_v3(rv3d->ofs, vod->dyn_ofs);
 			mul_qt_v3(q1, rv3d->ofs);
 			add_v3_v3(rv3d->ofs, vod->dyn_ofs);
 		}
@@ -575,7 +575,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y)
 
 		if (vod->use_dyn_ofs) {
 			conjugate_qt(q1); /* conj == inv for unit quat */
-			sub_v3_v3v3(rv3d->ofs, rv3d->ofs, vod->dyn_ofs);
+			sub_v3_v3(rv3d->ofs, vod->dyn_ofs);
 			mul_qt_v3(q1, rv3d->ofs);
 			add_v3_v3(rv3d->ofs, vod->dyn_ofs);
 		}
@@ -589,7 +589,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y)
 
 		if (vod->use_dyn_ofs) {
 			conjugate_qt(q1);
-			sub_v3_v3v3(rv3d->ofs, rv3d->ofs, vod->dyn_ofs);
+			sub_v3_v3(rv3d->ofs, vod->dyn_ofs);
 			mul_qt_v3(q1, rv3d->ofs);
 			add_v3_v3(rv3d->ofs, vod->dyn_ofs);
 		}
@@ -1675,7 +1675,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 
 			window_to_3d_delta(ar, dvec, (rect.xmin+rect.xmax-vb[0])/2, (rect.ymin+rect.ymax-vb[1])/2);
 			/* center the view to the center of the rectangle */
-			sub_v3_v3v3(new_ofs, new_ofs, dvec);
+			sub_v3_v3(new_ofs, dvec);
 		}
 
 		/* work out the ratios, so that everything selected fits when we zoom */
@@ -2298,7 +2298,7 @@ static int set_3dcursor_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 		if(depth_used==0) {
 			window_to_3d_delta(ar, dvec, mval[0]-mx, mval[1]-my);
-			sub_v3_v3v3(fp, fp, dvec);
+			sub_v3_v3(fp, dvec);
 		}
 	}
 	else {
@@ -2706,7 +2706,7 @@ void viewmoveNDOFfly(ARegion *ar, View3D *v3d, int mode)
 		upvec[2] = rv3d->dist;
 		copy_m3_m4(mat, rv3d->viewinv);
 		mul_m3_v3(mat, upvec);
-		sub_v3_v3v3(rv3d->ofs, rv3d->ofs, upvec);
+		sub_v3_v3(rv3d->ofs, upvec);
 		rv3d->dist = 0.0;
 	}
 
@@ -2748,7 +2748,7 @@ void viewmoveNDOFfly(ARegion *ar, View3D *v3d, int mode)
 
 	// translate the view
 
-	sub_v3_v3v3(rv3d->ofs, rv3d->ofs, tvec);
+	sub_v3_v3(rv3d->ofs, tvec);
 
 
 	/*----------------------------------------------------
@@ -2929,7 +2929,7 @@ void viewmoveNDOF(Scene *scene, ARegion *ar, View3D *v3d, int mode)
 
 	if (use_sel) {
 		conjugate_qt(q1); /* conj == inv for unit quat */
-		sub_v3_v3v3(rv3d->ofs, rv3d->ofs, obofs);
+		sub_v3_v3(rv3d->ofs, obofs);
 		mul_qt_v3(q1, rv3d->ofs);
 		add_v3_v3(rv3d->ofs, obofs);
 	}
@@ -2954,7 +2954,7 @@ void viewmoveNDOF(Scene *scene, ARegion *ar, View3D *v3d, int mode)
 
 	if (use_sel) {
 		conjugate_qt(q1);
-		sub_v3_v3v3(rv3d->ofs, rv3d->ofs, obofs);
+		sub_v3_v3(rv3d->ofs, obofs);
 		mul_qt_v3(q1, rv3d->ofs);
 		add_v3_v3(rv3d->ofs, obofs);
 	}
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index d0c69c9a4cb..495f240a97a 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -105,7 +105,7 @@ void view3d_get_view_aligned_coordinate(ViewContext *vc, float *fp, short mval[2
 	
 	if(mval[0]!=IS_CLIPPED) {
 		window_to_3d_delta(vc->ar, dvec, mval[0]-mx, mval[1]-my);
-		sub_v3_v3v3(fp, fp, dvec);
+		sub_v3_v3(fp, dvec);
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index ab991be7dad..5bce1992b53 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -452,7 +452,7 @@ static int snap_sel_to_grid(bContext *C, wmOperator *op)
 			vec[0]= gridf*floor(.5+ vec[0]/gridf);
 			vec[1]= gridf*floor(.5+ vec[1]/gridf);
 			vec[2]= gridf*floor(.5+ vec[2]/gridf);
-			sub_v3_v3v3(vec, vec, obedit->obmat[3]);
+			sub_v3_v3(vec, obedit->obmat[3]);
 			
 			mul_m3_v3(imat, vec);
 			VECCOPY(tv->loc, vec);
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 02ef62b22d3..6a661f18959 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -166,7 +166,7 @@ static void view_settings_from_ob(Object *ob, float *ofs, float *quat, float *di
 		vec[0]= vec[1] = 0.0;
 		vec[2]= -(*dist);
 		mul_m3_v3(tmat, vec);
-		sub_v3_v3v3(ofs, ofs, vec);
+		sub_v3_v3(ofs, vec);
 	}
 	
 	/* Lens */
@@ -536,7 +536,7 @@ void viewline(ARegion *ar, View3D *v3d, float mval[2], float ray_start[3], float
 		mul_v3_fl(vec, 1.0f / vec[3]);
 		
 		copy_v3_v3(ray_start, rv3d->viewinv[3]);
-		sub_v3_v3v3(vec, vec, ray_start);
+		sub_v3_v3(vec, ray_start);
 		normalize_v3(vec);
 		
 		VECADDFAC(ray_start, rv3d->viewinv[3], vec, v3d->near);
@@ -2044,12 +2044,12 @@ static int initFlyInfo (bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *even
 		if (fly->rv3d->persp==RV3D_ORTHO)
 			fly->rv3d->persp= RV3D_PERSP; /*if ortho projection, make perspective */
 		QUATCOPY(fly->rot_backup, fly->rv3d->viewquat);
-		VECCOPY(fly->ofs_backup, fly->rv3d->ofs);
-		fly->rv3d->dist= 0.0;
+		copy_v3_v3(fly->ofs_backup, fly->rv3d->ofs);
+		fly->rv3d->dist= 0.0f;
 
 		upvec[2]= fly->dist_backup; /*x and y are 0*/
 		mul_m3_v3(mat, upvec);
-		sub_v3_v3v3(fly->rv3d->ofs, fly->rv3d->ofs, upvec);
+		sub_v3_v3(fly->rv3d->ofs, upvec);
 		/*Done with correcting for the dist*/
 	}