[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51925] trunk/blender/source/blender: avoid using function calls in macros that result in multiple function calls .

Campbell Barton ideasman42 at gmail.com
Tue Nov 6 01:18:06 CET 2012


Revision: 51925
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51925
Author:   campbellbarton
Date:     2012-11-06 00:18:01 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
avoid using function calls in macros that result in multiple function calls.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-11-05 23:13:09 UTC (rev 51924)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-11-06 00:18:01 UTC (rev 51925)
@@ -88,7 +88,7 @@
 
 	v = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
 	for (i = 0; i < ototvert; i++) {
-		if (ABS(v->co[axis]) <= dist) {
+		if (fabsf(v->co[axis]) <= dist) {
 			BMO_slot_map_ptr_insert(bm, &weldop, "targetmap", vmap[i], v);
 		}
 		v = BM_iter_step(&iter);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c	2012-11-05 23:13:09 UTC (rev 51924)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c	2012-11-06 00:18:01 UTC (rev 51925)
@@ -103,7 +103,7 @@
 				out[0] = pow(in[0], in2[0]);
 			}
 			else {
-				float y_mod_1 = ABS(fmod(in2[0], 1));
+				float y_mod_1 = fabsf(fmodf(in2[0], 1.0f));
 				
 				/* if input value is not nearly an integer, fall back to zero, nicer than straight rounding */
 				if (y_mod_1 > 0.999f || y_mod_1 < 0.001f) {

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c	2012-11-05 23:13:09 UTC (rev 51924)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c	2012-11-06 00:18:01 UTC (rev 51925)
@@ -142,7 +142,7 @@
 				out[0]->vec[0] = pow(in[0]->vec[0], in[1]->vec[0]);
 			}
 			else {
-				float y_mod_1 = ABS(fmod(in[1]->vec[0], 1));
+				float y_mod_1 = fabsf(fmodf(in[1]->vec[0], 1.0f));
 				
 				/* if input value is not nearly an integer, fall back to zero, nicer than straight rounding */
 				if (y_mod_1 > 0.999f || y_mod_1 < 0.001f) {




More information about the Bf-blender-cvs mailing list