svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / modifiers / intern / MOD_bevel.c
index c746b10..1ae7982 100644 (file)
@@ -90,6 +90,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
                                                int UNUSED(useRenderParams),
                                                int UNUSED(isFinalCalc))
 {
+#if 1 /*BMESH_TODO*/
+       (void)md;
+       return CDDM_copy(derivedData, 0);
+#else
        DerivedMesh *result;
        BME_Mesh *bm;
 
@@ -112,12 +116,11 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
        BME_free_mesh(bm);
 
        CDDM_calc_normals(result);
-
-       return result;
+#endif
 }
 
 static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
-                                               EditMesh *UNUSED(editData),
+                                               struct BMEditMesh *UNUSED(editData),
                                                DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);