diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-27 19:48:16 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-27 19:48:16 +0400 |
| commit | c6ce8de20ef628c454916dbee8b7a655437fd208 (patch) | |
| tree | c8b766319821a65e56955e41320a51bc7db3dc5d | |
| parent | 00d934471901fb59d805ad75b28a12288655fb14 (diff) | |
Code cleanup / Cycles:
* Some cleanup for castings.
| -rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_math.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 56d78fb5c26..27c52797f5f 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -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; diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 05ed8a2d3f6..14ebf311a4b 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -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); diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index dfab15a6f12..9e874c9aa15 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -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 */ |