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/render | |
| parent | 23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff) | |
| parent | 522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/bake_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c index bd3e01c83a8..4405d38ae86 100644 --- a/source/blender/render/intern/source/bake_api.c +++ b/source/blender/render/intern/source/bake_api.c @@ -548,7 +548,7 @@ bool RE_bake_pixels_populate_from_objects( if (dm_highpoly[i]->getNumTessFaces(dm_highpoly[i]) != 0) { /* Create a bvh-tree for each highpoly object */ - bvhtree_from_mesh_faces(&treeData[i], dm_highpoly[i], 0.0, 2, 6); + bvhtree_from_mesh_get(&treeData[i], dm_highpoly[i], BVHTREE_FROM_FACES); if (treeData[i].tree == NULL) { printf("Baking: out of memory while creating BHVTree for object \"%s\"\n", highpoly[i].ob->id.name + 2); |