sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix/workaround for cycles crash packing bvh

Browse Source 
brecht - when you get time please look into this to see if the fix is ok.
This commit is contained in:
Campbell Barton 2012-07-09 12:55:16 +00:00
parent 98969c64ff
commit facb1512c0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,10 +378,19 @@ void BVH::pack_instances(size_t nodes_size)
int mesh_tri_offset = mesh->tri_offset; int mesh_tri_offset = mesh->tri_offset;
/* fill in node indexes for instances */ /* fill in node indexes for instances */
if(bvh->pack.is_leaf[0]) if(
/* XXX, brecht. check this is needed!. it could be a bug elsewhere
* /mango/pro/scenes/04_2e/04_2e.blend r2158. on Ian's system 192.168.3.27 - campbell */
(bvh->pack.is_leaf.size() != 0) &&
/* previously only checked this */
bvh->pack.is_leaf[0])
{
pack.object_node[object_offset++] = -noffset-1; pack.object_node[object_offset++] = -noffset-1;
else }
else {
pack.object_node[object_offset++] = noffset; pack.object_node[object_offset++] = noffset;
}
mesh_map[mesh] = pack.object_node[object_offset-1]; mesh_map[mesh] = pack.object_node[object_offset-1];