Attachment 182176 Details for Bug 218703 – fix compile error

[patch] fix compile error

patch-intern_cycles_bvh_bvh_build.cpp (text/plain), 1.26 KB, created by Christian Gusenbauer on 2017-04-29 15:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Gusenbauer

Created: 2017-04-29 15:20:03 UTC

Size: 1.26 KB

patch

obsolete

>--- intern/cycles/bvh/bvh_build.cpp.orig	2017-02-22 16:11:13.000000000 +0100
>+++ intern/cycles/bvh/bvh_build.cpp	2017-04-27 17:35:57.761048000 +0200
>@@ -905,12 +905,13 @@
> 	 *    can not control.
> 	 */
> 	typedef StackAllocator<256, int> LeafStackAllocator;
>+	typedef StackAllocator<256, float2> LeafTimeStackAllocator;
> 	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<float2, LeafStackAllocator> p_time[PRIMITIVE_NUM_TOTAL];
>+	vector<float2, LeafTimeStackAllocator> p_time[PRIMITIVE_NUM_TOTAL];
> 	vector<BVHReference, LeafReferenceStackAllocator> p_ref[PRIMITIVE_NUM_TOTAL];
> 
> 	/* TODO(sergey): In theory we should be able to store references. */
>@@ -964,7 +965,7 @@
> 	vector<int, LeafStackAllocator> local_prim_type,
> 	                                local_prim_index,
> 	                                local_prim_object;
>-	vector<float2, LeafStackAllocator> local_prim_time;
>+	vector<float2, LeafTimeStackAllocator> local_prim_time;
> 	local_prim_type.resize(num_new_prims);
> 	local_prim_index.resize(num_new_prims);
> 	local_prim_object.resize(num_new_prims);

Actions: View | Diff

Attachments on bug 218703: 181843 | 182176 | 182177 | 183122