Merge branch 'master' into soc-2013-depsgraph_mt
[blender.git] / source / blender / modifiers / intern / MOD_util.c
index 0c3746fc570bed6045bda3ad72e48ef03a02df1b..c087a7870c0dbdfc784e68a5b307339818af903c 100644 (file)
@@ -183,7 +183,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm,
        }
        else if (ob->type == OB_MESH) {
                if (em) dm = CDDM_from_editbmesh(em, FALSE, FALSE);
-               else dm = CDDM_from_mesh((struct Mesh *)(ob->data), ob);
+               else dm = CDDM_from_mesh((struct Mesh *)(ob->data));
 
                if (vertexCos) {
                        CDDM_apply_vert_coords(dm, vertexCos);