blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Cycles: Avoid shadowing in BVH code 

Run into some nasty bugs while trying various things here.

Wouldn't mind enabling -Wshadow for Cycles actually..
This commit is contained in:
Sergey Sharybin 2017-01-13 10:53:01 +01:00
parent a503e7626a
commit bd302ecf73
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/bvh/bvh_build.cpp
View File

@ -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;
}