[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57825] trunk/blender/intern/cycles: Code cleanup / Cycles:

Thomas Dinges blender at dingto.org
Thu Jun 27 17:48:16 CEST 2013


Revision: 57825
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57825
Author:   dingto
Date:     2013-06-27 15:48:16 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Some cleanup for castings. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_curves.cpp
    trunk/blender/intern/cycles/util/util_math.h

Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-06-27 15:40:32 UTC (rev 57824)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-06-27 15:48:16 UTC (rev 57825)
@@ -183,7 +183,7 @@
 				int mi = clamp(b_psys.settings().material()-1, 0, mesh->used_shaders.size()-1);
 				int shader = mesh->used_shaders[mi];
 				int draw_step = background ? b_psys.settings().render_step() : b_psys.settings().draw_step();
-				int ren_step = (int)pow((float)2.0f,(float)draw_step);
+				int ren_step = (int)powf(2.0f, draw_step);
 				int totparts = b_psys.particles.length();
 				int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_psys.settings().draw_percentage() / 100.0f);
 				int totcurves = totchild;

Modified: trunk/blender/intern/cycles/util/util_math.h
===================================================================
--- trunk/blender/intern/cycles/util/util_math.h	2013-06-27 15:40:32 UTC (rev 57824)
+++ trunk/blender/intern/cycles/util/util_math.h	2013-06-27 15:48:16 UTC (rev 57825)
@@ -1166,7 +1166,7 @@
 		return 1.0f;
 	if(a == 0.0f)
 		return 0.0f;
-	if(a < 0.0f && b != (int)b)
+	if(a < 0.0f && b != float_to_int(b))
 		return 0.0f;
 	
 	return compatible_powf(a, b);




More information about the Bf-blender-cvs mailing list