Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/bvh/bvh_params.h')
-rw-r--r--intern/cycles/bvh/bvh_params.h6
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; }