Cycles: Fix wrong allocator used for spatial builder
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 18 Aug 2016 18:47:14 +0000 (20:47 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 18 Aug 2016 18:47:48 +0000 (20:47 +0200)
intern/cycles/bvh/bvh_build.cpp

index 67ffb6853d6eec8c4318f84eb9ef948611d50d3d..f2a735d12e3f66ad771ede32ff83f40864adda2c 100644 (file)
@@ -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};