[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53860] trunk/blender/source/blender/ modifiers/intern/MOD_laplaciansmooth.c: code cleanup: double, float - conversion warnings.

[Campbell Barton]

Revision: 53860
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53860
Author:   campbellbarton
Date:     2013-01-16 23:07:24 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
code cleanup: double, float - conversion warnings.

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

Modified: trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c	2013-01-16 22:56:08 UTC (rev 53859)
+++ trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c	2013-01-16 23:07:24 UTC (rev 53860)
@@ -549,7 +549,7 @@
 	}
 	for (i = 0; i < sys->numVerts; i++) {
 		if (sys->zerola[i] == 0) {
-			lam = sys->numNeEd[i] == sys->numNeFa[i] ? (lambda >= 0.0 ? 1.0 : -1.0) : (lambda_border >= 0.0 ? 1.0 : -1.0);
+			lam = sys->numNeEd[i] == sys->numNeFa[i] ? (lambda >= 0.0f ? 1.0f : -1.0f) : (lambda_border >= 0.0f ? 1.0f : -1.0f);
 			if (flag & MOD_LAPLACIANSMOOTH_X) {
 				sys->vertexCos[i][0] += lam * (nlGetVariable(0, i) - sys->vertexCos[i][0]);
 			}
@@ -635,27 +635,27 @@
 			if (sys->zerola[i] == 0) {
 				if (smd->flag & MOD_LAPLACIANSMOOTH_NORMALIZED) {
 					w = sys->vweights[i];
-					sys->vweights[i] = (w == 0.0f) ? 0.0f : -fabs(smd->lambda) * wpaint / w;
+					sys->vweights[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda) * wpaint / w;
 					w = sys->vlengths[i];
-					sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabs(smd->lambda_border) * wpaint * 2.0f / w;
+					sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda_border) * wpaint * 2.0f / w;
 					if (sys->numNeEd[i] == sys->numNeFa[i]) {
-						nlMatrixAdd(i, i,  1.0f + fabs(smd->lambda) * wpaint);
+						nlMatrixAdd(i, i,  1.0f + fabsf(smd->lambda) * wpaint);
 					}
 					else {
-						nlMatrixAdd(i, i,  1.0f + fabs(smd->lambda_border) * wpaint * 2.0f);
+						nlMatrixAdd(i, i,  1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
 					}
 				}
 				else {
 					w = sys->vweights[i] * sys->ring_areas[i];
-					sys->vweights[i] = (w == 0.0f) ? 0.0f : -fabs(smd->lambda) * wpaint / (4.0f * w);
+					sys->vweights[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda) * wpaint / (4.0f * w);
 					w = sys->vlengths[i];
-					sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabs(smd->lambda_border) * wpaint * 2.0f / w;
+					sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda_border) * wpaint * 2.0f / w;
 
 					if (sys->numNeEd[i] == sys->numNeFa[i]) {
-						nlMatrixAdd(i, i,  1.0f + fabs(smd->lambda) * wpaint / (4.0f * sys->ring_areas[i]));
+						nlMatrixAdd(i, i,  1.0f + fabsf(smd->lambda) * wpaint / (4.0f * sys->ring_areas[i]));
 					}
 					else {
-						nlMatrixAdd(i, i,  1.0f + fabs(smd->lambda_border) * wpaint * 2.0f);
+						nlMatrixAdd(i, i,  1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
 					}
 				}
 			}