diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-08 23:28:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-08 23:28:50 +0300 |
| commit | 9ff3482af4a6335f0dca43f959848105f3979e61 (patch) | |
| tree | 197772c46487452501db8d689d45631620a6c603 /intern | |
| parent | fc412be5aca8ec581ea644c4ac3086fb85ae7081 (diff) | |
Fix Cycles embree render crash after recent refactor
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/bvh/bvh_embree.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |