[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46277] trunk/blender/source/blender: small improvement to last commit and quiet double promotion warnings.

[Campbell Barton]

Revision: 46277
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46277
Author:   campbellbarton
Date:     2012-05-04 13:22:44 +0000 (Fri, 04 May 2012)
Log Message:
-----------
small improvement to last commit and quiet double promotion warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/render/intern/source/strand.c

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-05-04 13:13:45 UTC (rev 46276)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-05-04 13:22:44 UTC (rev 46277)
@@ -2767,14 +2767,14 @@
                                   MVert *mvert, float normal[3])
 {
 	const int nverts = mpoly->totloop;
-	MLoop const *l_prev = loopstart + (nverts - 1);
-	MLoop const *l_curr = loopstart;
+	float const *v_prev = mvert[loopstart[nverts - 1].v].co;
+	float const *v_curr = mvert[loopstart->v].co;
 	float n[3] = {0.0f};
 	int i;
 
 	/* Newell's Method */
-	for (i = 0; i < nverts; l_prev = l_curr, l_curr++, i++) {
-		add_newell_cross_v3_v3v3(n, mvert[l_prev->v].co, mvert[l_curr->v].co);
+	for (i = 0; i < nverts; v_prev = v_curr, v_curr = mvert[loopstart[++i].v].co) {
+		add_newell_cross_v3_v3v3(n, v_prev, v_curr);
 	}
 
 	if (UNLIKELY(normalize_v3_v3(normal, n) == 0.0f)) {
@@ -2814,14 +2814,14 @@
                                          const float (*vertex_coords)[3], float normal[3])
 {
 	const int nverts = mpoly->totloop;
-	MLoop const *l_prev = loopstart + (nverts - 1);
-	MLoop const *l_curr = loopstart;
+	float const *v_prev = vertex_coords[loopstart[nverts - 1].v];
+	float const *v_curr = vertex_coords[loopstart->v];
 	float n[3] = {0.0f};
 	int i;
 
 	/* Newell's Method */
-	for (i = 0; i < nverts; l_prev = l_curr, l_curr++, i++) {
-		add_newell_cross_v3_v3v3(n, vertex_coords[l_prev->v], vertex_coords[l_curr->v]);
+	for (i = 0; i < nverts; v_prev = v_curr, v_curr = vertex_coords[loopstart[++i].v]) {
+		add_newell_cross_v3_v3v3(n, v_prev, v_curr);
 	}
 
 	if (UNLIKELY(normalize_v3_v3(normal, n) == 0.0f)) {

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-05-04 13:13:45 UTC (rev 46276)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-05-04 13:22:44 UTC (rev 46277)
@@ -2902,9 +2902,10 @@
 
 #define DRAW_EM_MEASURE_STATS_FACEAREA()                                      \
 	if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {                               \
-		mul_v3_fl(vmid, 1.0 / n);                                             \
+		mul_v3_fl(vmid, 1.0f / (float)n);                                     \
 		if (unit->system)                                                     \
-			bUnit_AsString(numstr, sizeof(numstr), area * unit->scale_length, \
+			bUnit_AsString(numstr, sizeof(numstr),                            \
+		                   (double)(area * unit->scale_length),               \
 			               3, unit->system, B_UNIT_LENGTH, do_split, FALSE);  \
 		else                                                                  \
 			BLI_snprintf(numstr, sizeof(numstr), conv_float, area);           \

Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/strand.c	2012-05-04 13:13:45 UTC (rev 46276)
+++ trunk/blender/source/blender/render/intern/source/strand.c	2012-05-04 13:22:44 UTC (rev 46277)
@@ -401,7 +401,7 @@
 
 	/* apply alpha along width */
 	if (sseg->buffer->widthfade != 0.0f) {
-		s = 1.0f - pow(fabs(s), sseg->buffer->widthfade);
+		s = 1.0f - powf(fabsf(s), sseg->buffer->widthfade);
 
 		strand_apply_shaderesult_alpha(ssamp->shr, s);
 	}