diff options
| author | Germano <germano.costa@ig.com.br> | 2018-05-04 16:12:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-05-04 16:12:47 +0300 |
| commit | 0a79de526d41e9880ee9d4f4b25fabd0fecdb3a4 (patch) | |
| tree | 0377a4166e206c0d2096048e0cc0037733d60991 /source/blender | |
| parent | 57a5ef8c611b2c0952153e9624c46ffb369b6a42 (diff) | |
| parent | 78fde19e682cff3e3c281675cc285da4a0b8c6da (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index f99bd773ebc..2c601e9429a 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -867,7 +867,7 @@ static void obstacles_from_derivedmesh( copy_v3_v3(&scs->verts_old[i * 3], co); } - if (bvhtree_from_mesh_looptri(&treeData, dm, 0.0f, 4, 6)) { + if (bvhtree_from_mesh_get(&treeData, dm, BVHTREE_FROM_LOOPTRI, 4)) { ObstaclesFromDMData data = { .sds = sds, .mvert = mvert, .mloop = mloop, .looptri = looptri, .tree = &treeData, .obstacle_map = obstacle_map, @@ -1738,7 +1738,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo res[i] = em->res[i] * hires_multiplier; } - if (bvhtree_from_mesh_looptri(&treeData, dm, 0.0f, 4, 6)) { + if (bvhtree_from_mesh_get(&treeData, dm, BVHTREE_FROM_LOOPTRI, 4)) { const float hr = 1.0f / ((float)hires_multiplier); EmitFromDMData data = { |