style cleanup

6 files changed, 17 insertions, 19 deletions

diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 33aada7b811..cdaf7d5690f 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -709,9 +709,9 @@ static void draw_sphere_bone_dist(float smat[][4], float imat[][4], bPoseChannel
 		glBegin(GL_QUAD_STRIP);
 		
 		for (a = 0; a < 16; a++) {
-			vec[0] = -*(si + a) * dirvec[0] + *(co + a) * norvec[0];
-			vec[1] = -*(si + a) * dirvec[1] + *(co + a) * norvec[1];
-			vec[2] = -*(si + a) * dirvec[2] + *(co + a) * norvec[2];
+			vec[0] = -si[a] * dirvec[0] + co[a] * norvec[0];
+			vec[1] = -si[a] * dirvec[1] + co[a] * norvec[1];
+			vec[2] = -si[a] * dirvec[2] + co[a] * norvec[2];
 
 			madd_v3_v3v3fl(vec1, headvec, vec, head);
 			madd_v3_v3v3fl(vec2, headvec, vec, head + dist);
@@ -723,9 +723,9 @@ static void draw_sphere_bone_dist(float smat[][4], float imat[][4], bPoseChannel
 		}
 		
 		for (a = 15; a >= 0; a--) {
-			vec[0] = *(si + a) * dirvec[0] + *(co + a) * norvec[0];
-			vec[1] = *(si + a) * dirvec[1] + *(co + a) * norvec[1];
-			vec[2] = *(si + a) * dirvec[2] + *(co + a) * norvec[2];
+			vec[0] = si[a] * dirvec[0] + co[a] * norvec[0];
+			vec[1] = si[a] * dirvec[1] + co[a] * norvec[1];
+			vec[2] = si[a] * dirvec[2] + co[a] * norvec[2];
 
 			madd_v3_v3v3fl(vec1, tailvec, vec, tail);
 			madd_v3_v3v3fl(vec2, tailvec, vec, tail + dist);
@@ -737,9 +737,9 @@ static void draw_sphere_bone_dist(float smat[][4], float imat[][4], bPoseChannel
 		}
 		/* make it cyclic... */
 		
-		vec[0] = -*(si) * dirvec[0] + *(co) * norvec[0];
-		vec[1] = -*(si) * dirvec[1] + *(co) * norvec[1];
-		vec[2] = -*(si) * dirvec[2] + *(co) * norvec[2];
+		vec[0] = -si[0] * dirvec[0] + co[0] * norvec[0];
+		vec[1] = -si[0] * dirvec[1] + co[0] * norvec[1];
+		vec[2] = -si[0] * dirvec[2] + co[0] * norvec[2];
 
 		madd_v3_v3v3fl(vec1, headvec, vec, head);
 		madd_v3_v3v3fl(vec2, headvec, vec, head + dist);
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 7d39a89a130..60b3b911b1b 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -373,7 +373,7 @@ void draw_volume(ARegion *ar, GPUTexture *tex, float min[3], float max[3], int r
 
 	/* d0 = (viewnormal[0]*cv[i][0] + viewnormal[1]*cv[i][1] + viewnormal[2]*cv[i][2]); */ /* UNUSED */
 	ds = (ABS(viewnormal[0]) * size[0] + ABS(viewnormal[1]) * size[1] + ABS(viewnormal[2]) * size[2]);
-	dd = ds/96.f;
+	dd = ds / 96.f;
 	n = 0;
 	good_index = i;
 
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index cc3d2d383b8..218aa71d621 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -2873,7 +2873,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
 			break;
 
 		case RV3D_VIEW_BACK:
-			axis_set_view(C, v3d, ar, 0.0, 0.0, (float)-cos(M_PI / 4.0), (float)-cos(M_PI / 4.0),
+			axis_set_view(C, v3d, ar, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0),
 			              viewnum, nextperspo, align_active);
 			break;
 
@@ -2888,7 +2888,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
 			break;
 
 		case RV3D_VIEW_FRONT:
-			axis_set_view(C, v3d, ar, (float)cos(M_PI / 4.0), (float)-sin(M_PI / 4.0), 0.0, 0.0,
+			axis_set_view(C, v3d, ar, cosf(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0,
 			              viewnum, nextperspo, align_active);
 			break;
 
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 4782b95ba1c..b4350847552 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1125,7 +1125,7 @@ int ED_view3d_lock(RegionView3D *rv3d)
 			break;
 
 		case RV3D_VIEW_BACK:
-			QUATSET(rv3d->viewquat, 0.0, 0.0, (float)-cos(M_PI / 4.0), (float)-cos(M_PI / 4.0));
+			QUATSET(rv3d->viewquat, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0));
 			break;
 
 		case RV3D_VIEW_LEFT:
@@ -1137,7 +1137,7 @@ int ED_view3d_lock(RegionView3D *rv3d)
 			break;
 
 		case RV3D_VIEW_FRONT:
-			QUATSET(rv3d->viewquat, (float)cos(M_PI / 4.0), (float)-sin(M_PI / 4.0), 0.0, 0.0);
+			QUATSET(rv3d->viewquat, (float)cos(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0);
 			break;
 
 		case RV3D_VIEW_RIGHT:
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 164c1dd7c12..44860258c89 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -5114,7 +5114,7 @@ void projectSVData(TransInfo *t, int final)
 
 				}
 				
-				if(!affected)
+				if (!affected)
 					continue;
 
 				/* only loop data, no vertex data since that contains shape keys,
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index c49e1715f34..3847087111e 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -463,12 +463,10 @@ static void initSnappingMode(TransInfo *t)
 			t->tsnap.mode = SCE_SNAP_MODE_INCREMENT;
 		}
 	}
-	else if (t->spacetype == SPACE_NODE)
-	{
+	else if (t->spacetype == SPACE_NODE) {
 		setSnappingCallback(t);
 		
-		if (t->tsnap.applySnap != NULL)
-		{
+		if (t->tsnap.applySnap != NULL) {
 			t->tsnap.modeSelect = SNAP_NOT_SELECTED;
 		}
 		else {