blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cycles: Fix crash after recent BVH changes on empty BVH trees 

It's apparently not nice to access 0th element of zero-size vector in C++.
This commit is contained in:
Sergey Sharybin 2015-01-12 19:11:32 +05:00
parent f9a4f8ada4
commit 51779d9407
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/bvh/bvh.cpp
View File

@ -510,11 +510,12 @@ void RegularBVH::pack_leaf(const BVHStackEntry& e, const LeafNode *leaf)
leaf->m_visibility, leaf->m_visibility);
}
else {
int prim_type = leaf->num_triangles() ? pack.prim_type[leaf->m_lo] : 0;
/* Triangle/curve primitive leaf. */
pack_node(e.idx, leaf->m_bounds, leaf->m_bounds,
leaf->m_lo, leaf->m_hi,
leaf->m_visibility,
pack.prim_type[leaf->m_lo]);
prim_type);
}
}
@ -707,7 +708,9 @@ void QBVH::pack_leaf(const BVHStackEntry& e, const LeafNode *leaf)
data[6].y = __int_as_float(leaf->m_hi);
}
data[6].z = __uint_as_float(leaf->m_visibility);
data[6].w = __uint_as_float(pack.prim_type[leaf->m_lo]);
if(leaf->num_triangles() != 0) {
data[6].w = __uint_as_float(pack.prim_type[leaf->m_lo]);
}
memcpy(&pack.nodes[e.idx * BVH_QNODE_SIZE], data, sizeof(float4)*BVH_QNODE_SIZE);
}