From 9ff3482af4a6335f0dca43f959848105f3979e61 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 8 Feb 2020 21:28:32 +0100 Subject: Fix Cycles embree render crash after recent refactor --- intern/cycles/bvh/bvh_embree.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 88302f11e7e..53f37501aab 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -918,7 +918,7 @@ void BVHEmbree::pack_nodes(const BVHNode *) rtc_memory_monitor_func(stats, unaccounted_mem, true); unaccounted_mem = 0; - int prim_offset = geom->prim_offset; + int geom_prim_offset = geom->prim_offset; /* fill in node indexes for instances */ pack.object_node[object_offset++] = prim_offset; @@ -934,11 +934,11 @@ void BVHEmbree::pack_nodes(const BVHNode *) for (size_t i = 0; i < bvh_prim_index_size; ++i) { if (bvh->pack.prim_type[i] & PRIMITIVE_ALL_CURVE) { - pack_prim_index[pack_prim_index_offset] = bvh_prim_index[i] + prim_offset; + pack_prim_index[pack_prim_index_offset] = bvh_prim_index[i] + geom_prim_offset; pack_prim_tri_index[pack_prim_index_offset] = -1; } else { - pack_prim_index[pack_prim_index_offset] = bvh_prim_index[i] + prim_offset; + pack_prim_index[pack_prim_index_offset] = bvh_prim_index[i] + geom_prim_offset; pack_prim_tri_index[pack_prim_index_offset] = bvh_prim_tri_index[i] + pack_prim_tri_verts_offset; } -- cgit v1.2.3