diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-13 12:53:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-13 12:53:01 +0300 |
| commit | 3160472a66fb66ceee18fcb8d08d8a785a4b34d5 (patch) | |
| tree | d2498cdd2e9c9a61deb98f5a707543a7e35674a9 /intern/cycles/bvh/bvh_build.cpp | |
| parent | bd6bd6275363017bacbbdeff29eb3a4a323ee48a (diff) | |
Cycles: Avoid shadowing in BVH code
Run into some nasty bugs while trying various things here.
Wouldn't mind enabling -Wshadow for Cycles actually..
Diffstat (limited to 'intern/cycles/bvh/bvh_build.cpp')
| -rw-r--r-- | intern/cycles/bvh/bvh_build.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index 48f1d063fd1..66e9ecae327 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -165,12 +165,13 @@ void BVHBuild::add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh, /* motion curve */ if(curve_attr_mP) { - size_t mesh_size = mesh->curve_keys.size(); - size_t steps = mesh->motion_steps - 1; - float3 *key_steps = curve_attr_mP->data_float3(); + const size_t mesh_size = mesh->curve_keys.size(); + const size_t num_steps = mesh->motion_steps - 1; + const float3 *key_steps = curve_attr_mP->data_float3(); - for(size_t i = 0; i < steps; i++) - curve.bounds_grow(k, key_steps + i*mesh_size, &mesh->curve_radius[0], bounds); + for(size_t step = 0; step < num_steps; step++) { + curve.bounds_grow(k, key_steps + step*mesh_size, &mesh->curve_radius[0], bounds); + } type = PRIMITIVE_MOTION_CURVE; } |