diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-05-03 20:06:36 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-05-03 20:06:36 +0400 |
| commit | afa872200c452adaed6d57d6b3c1f79fa86185c0 (patch) | |
| tree | 8f31ca77082e2672a289f81fa4dccaca40e6d520 /source/blender/blenlib/intern | |
| parent | 245ab753f527722c15bc28498f778bf55f33bf99 (diff) | |
merge multires changes into trunk
Diffstat (limited to 'source/blender/blenlib/intern')
| -rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index 67b75e95cf4..a189e9fbaf2 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -1214,6 +1214,8 @@ int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3], for(i = 0; i < totgrid; ++i) { DMGridData *grid= bvh->grids[node->prim_indices[i]]; + if (!grid) + continue; for(y = 0; y < gridsize-1; ++y) { for(x = 0; x < gridsize-1; ++x) { |