svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / modifiers / intern / MOD_collision.c
index f4a9ea62ead28cc5aa9358f88010108a3ea86a4c..2c07a6ee63cb2e28e2e96a745c7027d507066907 100644 (file)
@@ -119,7 +119,7 @@ static void deformVerts(ModifierData *md, Object *ob,
        MVert *tempVert = NULL;
        
        /* if possible use/create DerivedMesh */
-       if(derivedData) dm = CDDM_copy(derivedData);
+       if(derivedData) dm = CDDM_copy(derivedData, 0);
        else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob);
        
        if(!ob->pd)
@@ -168,8 +168,8 @@ static void deformVerts(ModifierData *md, Object *ob,
 
                                collmd->numverts = numverts;
                                
-                               collmd->mfaces = dm->dupFaceArray(dm);
-                               collmd->numfaces = dm->getNumFaces(dm);
+                               collmd->mfaces = dm->dupTessFaceArray(dm);
+                               collmd->numfaces = dm->getNumTessFaces(dm);
                                
                                // create bounding box hierarchy
                                collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->x, numverts, ob->pd->pdef_sboft);