diff options
| author | Germano <germano.costa@ig.com.br> | 2018-05-03 20:33:52 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-05-03 20:33:52 +0300 |
| commit | a9d264f5ca1d631e1151bff55fd8cb3c87193bce (patch) | |
| tree | 9c70cb490d8056f7f54a117eac4bdcba7a2c3237 /source/blender/editors/physics | |
| parent | 20185a8681f15f3e4e129e064fbe9a150dc4c963 (diff) | |
| parent | ac19483e632bd3e2388a6a0de2db753efe33a860 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 9322f8dd487..ecebcb1ff6c 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -699,11 +699,11 @@ static bool remap_hair_emitter( if (dm->getNumTessFaces(dm) != 0) { mface = dm->getTessFaceArray(dm); - bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES, 2); } else if (dm->getNumEdges(dm) != 0) { medge = dm->getEdgeArray(dm); - bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES, 2); } else { dm->release(dm); |