diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-06 02:57:58 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-06 02:57:58 +0400 |
commit | 8a20433f0fef5ab2d881d010cd5bd19fe484e555 (patch) | |
tree | cd9e8f67eb2d4d16d1b62244025db41cd342e805 /source/blender/blenlib/intern/pbvh.c | |
parent | a1d0913afe228aa55c47eea2d3ffd617df67fcc0 (diff) | |
parent | 09e6190b490213851711ea7356e76142f527a523 (diff) |
Merged changes in the trunk up to revision 28600.
Diffstat (limited to 'source/blender/blenlib/intern/pbvh.c')
-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) { |