diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 22:20:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 22:20:40 +0400 |
| commit | c6cffe98fa5eb6108956d484596153d214687e67 (patch) | |
| tree | 17079f588600f55e3bce07141453b39f4d13c905 /intern/cycles/bvh/bvh_params.h | |
| parent | 43361487bad926a9b32ce879f5b6961154507dfc (diff) | |
code cleanup: removed/renamed shadow & duplicate variable definitions.
Diffstat (limited to 'intern/cycles/bvh/bvh_params.h')
| -rw-r--r-- | intern/cycles/bvh/bvh_params.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h index 0cf5e905fea..a78496d841d 100644 --- a/intern/cycles/bvh/bvh_params.h +++ b/intern/cycles/bvh/bvh_params.h @@ -98,11 +98,11 @@ class BVHReference public: __forceinline BVHReference() {} - __forceinline BVHReference(const BoundBox& bounds_, int prim_index, int prim_object) + __forceinline BVHReference(const BoundBox& bounds_, int prim_index_, int prim_object_) : rbounds(bounds_) { - rbounds.min.w = __int_as_float(prim_index); - rbounds.max.w = __int_as_float(prim_object); + rbounds.min.w = __int_as_float(prim_index_); + rbounds.max.w = __int_as_float(prim_object_); } __forceinline const BoundBox& bounds() const { return rbounds; } |