diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 15:40:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 15:40:00 +0300 |
| commit | 5659d8bc0aa334aee20f29548e048f3002f1cff6 (patch) | |
| tree | 924286c8a2cac613491de5fabb6208192960f58a /source/blender/editors/physics/particle_object.c | |
| parent | 23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff) | |
| parent | 522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/particle_object.c')
| -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 23a6ba68fc9..9322f8dd487 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_faces(&bvhtree, dm, 0.0, 2, 6); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES); } else if (dm->getNumEdges(dm) != 0) { medge = dm->getEdgeArray(dm); - bvhtree_from_mesh_edges(&bvhtree, dm, 0.0, 2, 6); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES); } else { dm->release(dm); |