[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50894] trunk/blender/source/blender/ modifiers/intern/MOD_simpledeform.c: remove redundant NULL checks in somepledeform modifier (dcut is never NULL ).

[Campbell Barton]

Revision: 50894
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50894
Author:   campbellbarton
Date:     2012-09-25 22:05:40 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
remove redundant NULL checks in somepledeform modifier (dcut is never NULL).

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2012-09-25 18:30:37 UTC (rev 50893)
+++ trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2012-09-25 22:05:40 UTC (rev 50894)
@@ -72,7 +72,7 @@
 	r_co[1] = y + y * scale;
 	r_co[2] = z;
 
-	if (dcut) {
+	{
 		r_co[0] += dcut[0];
 		r_co[1] += dcut[1];
 		r_co[2] += dcut[2];
@@ -90,7 +90,7 @@
 	r_co[1] = y * scale;
 	r_co[2] = z * (1.0f + factor);
 
-	if (dcut) {
+	{
 		r_co[0] += dcut[0];
 		r_co[1] += dcut[1];
 		r_co[2] += dcut[2];
@@ -110,7 +110,7 @@
 	r_co[1] = x * sint + y * cost;
 	r_co[2] = z;
 
-	if (dcut) {
+	{
 		r_co[0] += dcut[0];
 		r_co[1] += dcut[1];
 		r_co[2] += dcut[2];
@@ -132,7 +132,7 @@
 		r_co[2] = z;
 	}
 
-	if (dcut) {
+	{
 		r_co[0] += cost * dcut[0];
 		r_co[1] += sint * dcut[0];
 		r_co[2] += dcut[2];
@@ -163,7 +163,7 @@
 
 	smd->limit[0] = minf(smd->limit[0], smd->limit[1]);  /* Upper limit >= than lower limit */
 
-	//Calculate matrixs do convert between coordinate spaces
+	/* Calculate matrixs do convert between coordinate spaces */
 	if (smd->origin) {
 		transf = &tmp_transf;
 
@@ -176,10 +176,11 @@
 		}
 	}
 
-	//Setup vars
-	limit_axis  = (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) ? 0 : 2; //Bend limits on X.. all other modes limit on Z
+	/* Setup vars,
+	 * Bend limits on X.. all other modes limit on Z */
+	limit_axis  = (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) ? 0 : 2;
 
-	//Update limits if needed
+	/* Update limits if needed */
 	{
 		float lower =  FLT_MAX;
 		float upper = -FLT_MAX;
@@ -199,7 +200,7 @@
 		smd_limit[1] = lower + (upper - lower) * smd->limit[1];
 		smd_limit[0] = lower + (upper - lower) * smd->limit[0];
 
-		smd_factor   = smd->factor / MAX2(FLT_EPSILON, smd_limit[1] - smd_limit[0]);
+		smd_factor   = smd->factor / maxf(FLT_EPSILON, smd_limit[1] - smd_limit[0]);
 	}
 
 	modifier_get_vgroup(ob, dm, smd->vgroup_name, &dvert, &vgroup);
@@ -235,7 +236,9 @@
 			simpleDeform_callback(smd_factor, dcut, co);  /* apply deform */
 			interp_v3_v3v3(vertexCos[i], vertexCos[i], co, weight);  /* Use vertex weight has coef of linear interpolation */
 
-			if (transf) space_transform_invert(transf, vertexCos[i]);
+			if (transf) {
+				space_transform_invert(transf, vertexCos[i]);
+			}
 		}
 	}
 }