Commit: 675587e12d3c145ac070f8908f01dc4fb8bff084
Author: Sergey Sharybin
Date: Wed May 18 16:18:19 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rB675587e12d3c145ac070f8908f01dc4fb8bff084
Merge branch 'master' into cycles_hair_bvh
===================================================================
===================================================================
diff --cc intern/cycles/bvh/bvh_build.cpp
index dbe38a3,76a1bfa..1c6a778
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@@ -706,9 -607,10 +706,11 @@@ BVHNode* BVHBuild::create_leaf_node(con
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];
+
/* TODO(sergey): In theory we should be able to store references. */
- vector<BVHReference, LeafStackAllocator> object_references;
+ typedef StackAllocator<256, BVHReference> LeafReferenceStackAllocator;
+ vector<BVHReference, LeafReferenceStackAllocator> object_references;
uint visibility[PRIMITIVE_NUM_TOTAL] = {0};
/* NOTE: Keep initializtion in sync with actual number of primitives. */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
