Cycles: Simplify some code in Curve BVH reference fill
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jan 2017 09:59:34 +0000 (10:59 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jan 2017 09:59:34 +0000 (10:59 +0100)
makes code slightly shorter and uses idea of const qualifiers.

intern/cycles/bvh/bvh_build.cpp

index 66e9ecae327771fe471c3dbdb4c46971fda6c164..036500843c7006417b7e79a70105cb48b843141b 100644 (file)
@@ -156,12 +156,13 @@ void BVHBuild::add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh,
 
                size_t num_curves = mesh->num_curves();
                for(uint j = 0; j < num_curves; j++) {
-                       Mesh::Curve curve = mesh->get_curve(j);
+                       const Mesh::Curve curve = mesh->get_curve(j);
                        PrimitiveType type = PRIMITIVE_CURVE;
+                       const float *curve_radius = &mesh->curve_radius[0];
 
                        for(int k = 0; k < curve.num_keys - 1; k++) {
                                BoundBox bounds = BoundBox::empty;
-                               curve.bounds_grow(k, &mesh->curve_keys[0], &mesh->curve_radius[0], bounds);
+                               curve.bounds_grow(k, &mesh->curve_keys[0], curve_radius, bounds);
 
                                /* motion curve */
                                if(curve_attr_mP) {
@@ -170,7 +171,7 @@ void BVHBuild::add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh,
                                        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, &mesh->curve_radius[0], bounds);
+                                               curve.bounds_grow(k, key_steps + step*mesh_size, curve_radius, bounds);
                                        }
 
                                        type = PRIMITIVE_MOTION_CURVE;