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/editors | |
| 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/editors')
| -rw-r--r-- | source/blender/editors/mesh/bmesh_tools.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 532f0714a8f..8861f94ca9b 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -4598,7 +4598,7 @@ static int mesh_export_obj_exec(bContext *C, wmOperator *op) } else { dm = mesh_get_derived_final(scene, ob, CD_MASK_DERIVEDMESH); if (!CDDM_Check(dm)) { - dm = CDDM_copy(dm, 0); + dm = CDDM_copy(dm); free = 1; } else { free = 0; diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 75fa52bf7ac..1293e62c990 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -996,7 +996,7 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l if(*lvl==0) { DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob); - dm= CDDM_copy(tmp_dm, 0); + dm= CDDM_copy(tmp_dm); tmp_dm->release(tmp_dm); } else { MultiresModifierData tmp_mmd= *mmd; diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 5732f6419d1..da3f7e1f7c1 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -645,7 +645,7 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys) if(psmd->dm->deformedOnly) /* we don't want to mess up psmd->dm when converting to global coordinates below */ - dm= CDDM_copy(psmd->dm, 0); + dm= CDDM_copy(psmd->dm); else dm= mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH); |