[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34979] trunk/blender/source/blender/nodes /intern: Fix for building math nodes provided by DustyDingo

Daniel Salazar zanqdo at gmail.com
Fri Feb 18 23:15:44 CET 2011


Revision: 34979
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34979
Author:   zanqdo
Date:     2011-02-18 22:15:43 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Fix for building math nodes provided by DustyDingo

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2011-02-18 19:33:19 UTC (rev 34978)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2011-02-18 22:15:43 UTC (rev 34979)
@@ -101,7 +101,7 @@
                 float y_mod_1 = fmod(in2[0], 1);
 				/* if input value is not nearly an integer, fall back to zero, nicer than straight rounding */
                 if (y_mod_1 > 0.999 || y_mod_1 < 0.001) {
-                    out[0]= pow(in[0], round(in2[0]));
+                    out[0]= pow(in[0], floor(in2[0] + 0.5));
                 } else {
                     out[0] = 0.0;
                 }

Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c	2011-02-18 19:33:19 UTC (rev 34978)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c	2011-02-18 22:15:43 UTC (rev 34979)
@@ -112,7 +112,7 @@
             } else {
                 float y_mod_1 = fmod(in1, 1);
                 if (y_mod_1 > 0.999 || y_mod_1 < 0.001) {
-                    *out = pow(in0, round(in1));
+                    *out = pow(in0, floor(in1 + 0.5));
                 } else {
                     *out = 0.0;
                 }




More information about the Bf-blender-cvs mailing list