[Bf-blender-cvs] [5fabcd0] master: Use looptri for smoke bvhtree
Campbell Barton
noreply at git.blender.org
Thu Jul 30 07:50:18 CEST 2015
Commit: 5fabcd099b09d67269703ba1864e49df7f55563a
Author: Campbell Barton
Date: Thu Jul 30 14:50:51 2015 +1000
Branches: master
https://developer.blender.org/rB5fabcd099b09d67269703ba1864e49df7f55563a
Use looptri for smoke bvhtree
Missed from D1424
===================================================================
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index e802b29..2637969 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1662,7 +1662,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
res[i] = em->res[i] * hires_multiplier;
}
- if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) {
+ if (bvhtree_from_mesh_looptri(&treeData, dm, 0.0f, 4, 6)) {
#pragma omp parallel for schedule(static)
for (z = min[2]; z < max[2]; z++) {
int x, y;
@@ -2650,7 +2650,7 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
if (smd->flow->dm) smd->flow->dm->release(smd->flow->dm);
smd->flow->dm = CDDM_copy(dm);
- DM_ensure_tessface(smd->flow->dm);
+ DM_ensure_looptri(smd->flow->dm);
if (scene->r.cfra > smd->time)
{
@@ -2673,7 +2673,7 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
smd->coll->dm->release(smd->coll->dm);
smd->coll->dm = CDDM_copy(dm);
- DM_ensure_tessface(smd->coll->dm);
+ DM_ensure_looptri(smd->coll->dm);
}
smd->time = scene->r.cfra;
More information about the Bf-blender-cvs
mailing list