Commit: ebc695ef2cb2bd410b34e1926c33ab134bbed0b6
Author: Sergey Sharybin
Date: Mon Jan 16 20:27:05 2017 +0100
Branches: master
https://developer.blender.org/rBebc695ef2cb2bd410b34e1926c33ab134bbed0b6
Cycles: Cleanup, better variable name
===================================================================
M intern/cycles/bvh/bvh_build.cpp
===================================================================
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 8cf1495b33..f0651db6c9 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -130,12 +130,12 @@ void BVHBuild::add_reference_mesh(BoundBox& root,
BoundBox& center, Mesh *mesh,
/* motion triangles */
if(attr_mP) {
- const size_t mesh_size = mesh->verts.size();
+ const size_t num_verts = mesh->verts.size();
const size_t num_steps = mesh->motion_steps - 1;
const float3 *vert_steps =
attr_mP->data_float3();
for(size_t step = 0; step < num_steps; step++) {
- t.bounds_grow(vert_steps +
step*mesh_size, bounds);
+ t.bounds_grow(vert_steps +
step*num_verts, bounds);
}
type = PRIMITIVE_MOTION_TRIANGLE;
@@ -167,12 +167,12 @@ void BVHBuild::add_reference_mesh(BoundBox& root,
BoundBox& center, Mesh *mesh,
/* motion curve */
if(curve_attr_mP) {
- const size_t mesh_size =
mesh->curve_keys.size();
+ const size_t num_keys =
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 step = 0; step < num_steps;
step++) {
- curve.bounds_grow(k, key_steps
+ step*mesh_size, curve_radius, bounds);
+ curve.bounds_grow(k, key_steps
+ step*num_keys, curve_radius, bounds);
}
type = PRIMITIVE_MOTION_CURVE;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
