svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / modifiers / intern / MOD_surface.c
index 258627e..161bdca 100644 (file)
@@ -99,7 +99,7 @@ static void deformVerts(ModifierData *md, Object *ob,
                surmd->dm->release(surmd->dm);
 
        /* if possible use/create DerivedMesh */
-       if(derivedData) surmd->dm = CDDM_copy(derivedData);
+       if(derivedData) surmd->dm = CDDM_copy(derivedData, 0);
        else surmd->dm = get_dm(ob, NULL, NULL, NULL, 0);
        
        if(!ob->pd)
@@ -158,7 +158,7 @@ static void deformVerts(ModifierData *md, Object *ob,
                else
                        surmd->bvhtree = MEM_callocN(sizeof(BVHTreeFromMesh), "BVHTreeFromMesh");
 
-               if(surmd->dm->getNumFaces(surmd->dm))
+               if(surmd->dm->getNumTessFaces(surmd->dm))
                        bvhtree_from_mesh_faces(surmd->bvhtree, surmd->dm, 0.0, 2, 6);
                else
                        bvhtree_from_mesh_edges(surmd->bvhtree, surmd->dm, 0.0, 2, 6);