bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Code cleanup / Cycles:

Browse Source 
* Some cleanup for castings.
This commit is contained in:
Thomas Dinges 2013-06-27 15:48:16 +00:00
parent 00d9344719
commit c6ce8de20e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_curves.cpp
View File

@ -183,7 +183,7 @@ bool ObtainCacheParticleData(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, Par
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, (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;

2
intern/cycles/util/util_math.h
View File

@ -1166,7 +1166,7 @@ __device float safe_powf(float a, float b)
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);

2
source/blender/blenkernel/BKE_blender.h
View File

@ -52,7 +52,7 @@ extern "C" {
/* 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 */