diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-18 21:47:14 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-18 21:47:48 +0300 |
| commit | ca5271e637cdf75b1739a18a27f86ea7610450b1 (patch) | |
| tree | b7f998ebcae9f6c8367037a09bcc74eda83fb549 /intern/cycles/bvh/bvh_build.cpp | |
| parent | f4e4009afd700e049ebb9cb239b34a31db13329b (diff) | |
Cycles: Fix wrong allocator used for spatial builder
Diffstat (limited to 'intern/cycles/bvh/bvh_build.cpp')
| -rw-r--r-- | intern/cycles/bvh/bvh_build.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index 67ffb6853d6..f2a735d12e3 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -713,14 +713,14 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range, * can not control. */ typedef StackAllocator<256, int> LeafStackAllocator; + typedef StackAllocator<256, BVHReference> LeafReferenceStackAllocator; vector<int, LeafStackAllocator> p_type[PRIMITIVE_NUM_TOTAL]; vector<int, LeafStackAllocator> p_index[PRIMITIVE_NUM_TOTAL]; vector<int, LeafStackAllocator> p_object[PRIMITIVE_NUM_TOTAL]; - vector<BVHReference, LeafStackAllocator> p_ref[PRIMITIVE_NUM_TOTAL]; + vector<BVHReference, LeafReferenceStackAllocator> p_ref[PRIMITIVE_NUM_TOTAL]; /* TODO(sergey): In theory we should be able to store references. */ - typedef StackAllocator<256, BVHReference> LeafReferenceStackAllocator; vector<BVHReference, LeafReferenceStackAllocator> object_references; uint visibility[PRIMITIVE_NUM_TOTAL] = {0}; |