diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
| commit | f07df7287e60ede904993572fe9bfef2c3a324af (patch) | |
| tree | 205c89f1890164ad384dcd3e5d09547d44287ee3 /source/blender/blenkernel/intern/bvhutils.c | |
| parent | 3267a619f1e1a5b5508e38cbc665da79f450b2e3 (diff) | |
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
Diffstat (limited to 'source/blender/blenkernel/intern/bvhutils.c')
| -rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 19838a634f8..e7f9e40ec3e 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -652,7 +652,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float copy_v3_v3(co[2], vert[ face[i].v3 ].co); if(face[i].v4) copy_v3_v3(co[3], vert[ face[i].v4 ].co); - + BLI_bvhtree_insert(tree, i, co[0], face[i].v4 ? 4 : 3); } } |