missed these last commit
authorCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jan 2012 22:32:00 +0000 (22:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jan 2012 22:32:00 +0000 (22:32 +0000)
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/smoke.c

index 9766d4461c2a7385e14b2da247e1530439de3ccd..151a23a6e5947a1b75f1f03007d664f9a304211d 100644 (file)
@@ -2786,7 +2786,7 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm)
        int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL;
        int res;
 
-       result = CDDM_copy(dm, 0);
+       result = CDDM_copy(dm);
        if (!CustomData_has_layer(&result->faceData, CD_RECAST)) {
                int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
                if (sourceRecastData) {
index cd2d4c0c1f8488ec64c0d1d122ecfe7a806fbf71..e42f3b9fb01b00874aad3c6190bd7f77d61c645a 100644 (file)
@@ -1354,7 +1354,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM
                        if(smd->coll->dm)
                                smd->coll->dm->release(smd->coll->dm);
 
-                       smd->coll->dm = CDDM_copy(dm, 1);
+                       smd->coll->dm = CDDM_copy_from_tessface(dm);
 #endif
 
                        // rigid movement support