diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-09 13:35:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-09 13:35:16 +0300 |
| commit | 21298978f68db176b42fa10c79fa91e2d3b96be0 (patch) | |
| tree | ee62fd5011d345f2511a871a29a4b6a8397b068c /source/blender/blenkernel/intern/bvhutils.c | |
| parent | 632755a3b1988e7553b381c2d737cb956e26780b (diff) | |
| parent | f3efa9e15f58d98087796feb263680deb5cd7047 (diff) | |
Merge branch 'master' into blender2.8
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 f3634d8bd90..0360ae8fe9e 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -1138,7 +1138,7 @@ BVHTree *bvhtree_from_mesh_get( data->looptri = looptri; data->vert_allocated = vert_allocated; data->edge_allocated = edge_allocated; - data->edge_allocated = edge_allocated; + data->face_allocated = face_allocated; data->loop_allocated = loop_allocated; data->looptri_allocated = looptri_allocated; |