[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57826] trunk/blender: * Fix for last commit, eek!

[Thomas Dinges]

Revision: 57826
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57826
Author:   dingto
Date:     2013-06-27 15:53:53 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
* Fix for last commit, eek!
* Also bump BLENDER_VERSION_CYCLE char to rc

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_curves.cpp
    trunk/blender/source/blender/blenkernel/BKE_blender.h

Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-06-27 15:48:16 UTC (rev 57825)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-06-27 15:53:53 UTC (rev 57826)
@@ -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)powf(2.0f, draw_step);
+				int ren_step = (int)powf(2.0f, (float)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/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-06-27 15:48:16 UTC (rev 57825)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-06-27 15:53:53 UTC (rev 57826)
@@ -52,7 +52,7 @@
 /* can be left blank, otherwise a,b,c... etc with no quotes */
 #define BLENDER_VERSION_CHAR    b
 /* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE   alpha
+#define BLENDER_VERSION_CYCLE   rc
 
 extern char versionstr[]; /* from blender.c */