svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / modifiers / intern / MOD_subsurf.c
index d42c95a..7fd2d4c 100644 (file)
@@ -101,7 +101,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
                        useRenderParams, NULL, isFinalCalc, 0, (ob->flag & OB_MODE_EDIT));
        
        if(useRenderParams || !isFinalCalc) {
-               DerivedMesh *cddm= CDDM_copy(result);
+               DerivedMesh *cddm= CDDM_copy(result, 0);
                result->release(result);
                result= cddm;
        }
@@ -110,7 +110,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob),
-                                               struct EditMesh *UNUSED(editData),
+                                               struct BMEditMesh *UNUSED(editData),
                                                DerivedMesh *derivedData)
 {
        SubsurfModifierData *smd = (SubsurfModifierData*) md;