diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:59:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:59:47 +0400 |
commit | 2ea8a3b8cafb5ff7e88b08927fd8f5670ce5017e (patch) | |
tree | efb6dc93c633ac5ba55ce846ffd426104293c476 /source/blender/modifiers | |
parent | 870aa901120fc8db499f9bea3a9a86006ef4cc3a (diff) |
remove CDDM_copy second argument, added CDDM_copy_from_tessface instead.
this function caused too many conflicts and in most cases was zero anyway.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_multires.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ngoninterp.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_surface.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 75136e444e6..363f0f4079d 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -120,7 +120,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, float threshold = cos((bmd->bevel_angle + 0.00001) * M_PI / 180.0); if (!CDDM_Check(dm)) { - cddm = CDDM_copy(dm, 0); + cddm = CDDM_copy(dm); } else cddm = dm; em = CDDM_To_BMesh(ob, dm, NULL, FALSE); diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index e773b772b2b..6014413bd00 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -101,7 +101,7 @@ static DerivedMesh *get_quick_derivedMesh(DerivedMesh *derivedData, DerivedMesh case eBooleanModifierOp_Union: if(derivedData->getNumPolys(derivedData)) result = derivedData; - else result = CDDM_copy(dm, FALSE); + else result = CDDM_copy(dm); break; diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index f626a2f86fe..fdb584ec592 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -85,7 +85,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, dm = get_dm(ob, NULL, derivedData, NULL, 0); if(dm == derivedData) - dm = CDDM_copy(dm, 0); + dm = CDDM_copy(dm); CDDM_apply_vert_coords(dm, vertexCos); diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 99d608351d8..92ef79b4a8e 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -117,7 +117,7 @@ static void deformVerts(ModifierData *md, Object *ob, MVert *tempVert = NULL; /* if possible use/create DerivedMesh */ - if(derivedData) dm = CDDM_copy(derivedData, 0); + if(derivedData) dm = CDDM_copy(derivedData); else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob); if(!ob->pd) diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index bb7e1f52062..bc7771d86b0 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -98,7 +98,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), if(numTris<3) { modifier_setError(md, "Modifier requires more than 3 input faces (triangles)."); - dm = CDDM_copy(dm, 0); + dm = CDDM_copy(dm); return dm; } diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index b44eeb1b816..eec7c6badad 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -68,7 +68,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj float threshold = cos((emd->split_angle + 0.00001) * M_PI / 180.0); if (!CDDM_Check(dm)) { - cddm = CDDM_copy(dm, 0); + cddm = CDDM_copy(dm); } else cddm = dm; em = CDDM_To_BMesh(ob, dm, NULL, FALSE); diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index de3989dfe38..769ad864d98 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -90,7 +90,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm, return dm; if(useRenderParams || !isFinalCalc) { - DerivedMesh *cddm= CDDM_copy(result, 0); + DerivedMesh *cddm= CDDM_copy(result); result->release(result); result= cddm; } diff --git a/source/blender/modifiers/intern/MOD_ngoninterp.c b/source/blender/modifiers/intern/MOD_ngoninterp.c index 08d83016e18..264578ea3d8 100644 --- a/source/blender/modifiers/intern/MOD_ngoninterp.c +++ b/source/blender/modifiers/intern/MOD_ngoninterp.c @@ -99,7 +99,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), return dm; if (!CDDM_Check(dm)) { - dm = copy = CDDM_copy(dm, 0); + dm = copy = CDDM_copy(dm); } CDDM_recalc_tesselation(dm); diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 296e377f6fa..b3553c04cf4 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -437,7 +437,7 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob, if (omd->geometry_mode == MOD_OCEAN_GEOM_GENERATE) dm = generate_ocean_geometry(omd); else if (omd->geometry_mode == MOD_OCEAN_GEOM_DISPLACE) { - dm = CDDM_copy(derivedData, 0); + dm = CDDM_copy(derivedData); } cfra = md->scene->r.cfra; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 4021a8a8114..98a1921f14b 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -164,7 +164,7 @@ static void deformVerts(ModifierData *md, Object *ob, } /* make new dm */ - psmd->dm=CDDM_copy(dm, 0); + psmd->dm=CDDM_copy(dm); CDDM_apply_vert_coords(psmd->dm, vertexCos); CDDM_calc_normals(psmd->dm); diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index c37a8bccedf..ea508240813 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -197,7 +197,7 @@ static DerivedMesh *applyModifier(ModifierData *md, #else /* BMESH ONLY */ - dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/ + dm = CDDM_copy_from_tessface(result); /*builds ngon faces from tess (mface) faces*/ CDDM_calc_normals(dm); result->needsFree = 1; result->release(result); diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 7fd2d4c31ca..5d6d6c2e82c 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -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, 0); + DerivedMesh *cddm= CDDM_copy(result); result->release(result); result= cddm; } diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 161bdcaf4ac..7e85acd47e9 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -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, 0); + if(derivedData) surmd->dm = CDDM_copy(derivedData); else surmd->dm = get_dm(ob, NULL, NULL, NULL, 0); if(!ob->pd) diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 9c6d87d0074..6a84346b69e 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -168,7 +168,7 @@ DerivedMesh *get_cddm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float dm= get_dm(ob, em, dm, vertexCos, 0); } else { - dm= CDDM_copy(dm, 0); + dm= CDDM_copy(dm); CDDM_apply_vert_coords(dm, vertexCos); } |