merge with 2.5 (not trunk, last merge message said that on accident) at r22252
[blender.git] / source / blender / blenkernel / intern / smoke.c
index 3f23fbda484beb996bddc98ded51e6bc2501aa08..b461592f35f8b9528715f8aa6296dfc6aa2a04bd 100644 (file)
@@ -316,7 +316,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
                        // init collision points
                        SmokeCollSettings *scs = smd->coll;
                        MVert *mvert = dm->getVertArray(dm);
-                       MFace *mface = dm->getFaceArray(dm);
+                       MFace *mface = dm->getTessFaceArray(dm);
                        size_t i = 0, divs = 0;
                        int *tridivs = NULL;
                        float cell_len = 1.0 / 50.0; // for res = 50
@@ -451,7 +451,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive
 
                if(!smd->coll->bvhtree)
                {
-                       smd->coll->bvhtree = bvhtree_build_from_smoke ( ob->obmat, dm->getFaceArray(dm), dm->getNumFaces(dm), dm->getVertArray(dm), dm->getNumVerts(dm), 0.0 );
+                       smd->coll->bvhtree = bvhtree_build_from_smoke ( ob->obmat, dm->getTessFaceArray(dm), dm->getNumFaces(dm), dm->getVertArray(dm), dm->getNumVerts(dm), 0.0 );
                }
 
        }
@@ -780,7 +780,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
                        smd->time = scene->r.cfra;
                        
                        if(smd->coll->bvhtree)
-                               bvhtree_update_from_smoke ( ob->obmat, smd->coll->bvhtree, dm->getFaceArray(dm), dm->getNumFaces(dm), dm->getVertArray(dm), dm->getNumVerts(dm));
+                               bvhtree_update_from_smoke ( ob->obmat, smd->coll->bvhtree, dm->getTessFaceArray(dm), dm->getNumFaces(dm), dm->getVertArray(dm), dm->getNumVerts(dm));
                        else
                                printf("smoke coll with no bvh\n");
                }