rename

* CDDM_calc_edges --> CDDM_calc_edges_tessface
* CDDM_calc_edges_poly --> CDDM_calc_edges

9 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index cd2487022de..15d1dce4e8d 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -107,11 +107,11 @@ void CDDM_calc_normals_tessface(struct DerivedMesh *dm);
  * this completely replaces the current edge data in the DerivedMesh
  * builds edges from the tesselated face data.
  */
-void CDDM_calc_edges(struct DerivedMesh *dm);
+void CDDM_calc_edges_tessface(struct DerivedMesh *dm);
 
-/* same as CDDM_calc_edges only makes edges from ngon faces instead of tesselation
+/* same as CDDM_calc_edges_tessface only makes edges from ngon faces instead of tesselation
    faces*/
-void CDDM_calc_edges_poly(struct DerivedMesh *dm);
+void CDDM_calc_edges(struct DerivedMesh *dm);
 
 /* reconstitute face triangulation */
 void CDDM_recalc_tesselation(struct DerivedMesh *dm);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index d913457bfa0..823436afb1e 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -2495,7 +2495,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap)
 }
 #endif
 
-void CDDM_calc_edges(DerivedMesh *dm)
+void CDDM_calc_edges_tessface(DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
 	CustomData edgeData;
@@ -2551,8 +2551,8 @@ void CDDM_calc_edges(DerivedMesh *dm)
 	BLI_edgehash_free(eh, NULL);
 }
 
-/* warning, this uses existing edges but CDDM_calc_edges() doesn't */
-void CDDM_calc_edges_poly(DerivedMesh *dm)
+/* warning, this uses existing edges but CDDM_calc_edges_tessface() doesn't */
+void CDDM_calc_edges(DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
 	CustomData edgeData;
@@ -2709,7 +2709,7 @@ void CDDM_tessfaces_to_faces(DerivedMesh *dm)
 	int i, totloop;
 	
 	/*ensure we have all the edges we need*/
-	CDDM_calc_edges(dm);
+	CDDM_calc_edges_tessface(dm);
 
 	/*build edge hash*/
 	me = cddm->medge;
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 9ae0e515acc..4c17ee54fd2 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -432,7 +432,7 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh(
 	if (material_hash)
 		BLI_ghash_free(material_hash, NULL, NULL);
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 
 	CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/
 
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index b481391b8e3..bb7e1f52062 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -169,7 +169,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 				}
 			}
 
-			CDDM_calc_edges(result);
+			CDDM_calc_edges_tessface(result);
 		}
 		else
 			modifier_setError(md, "Out of memory.");
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 4af4cc74b5b..75d9e7e0782 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -951,7 +951,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd,
 	BLI_edgehash_free(vertpahash, NULL);
 
 	/* finalization */
-	CDDM_calc_edges(explode);
+	CDDM_calc_edges_tessface(explode);
 	CDDM_tessfaces_to_faces(explode);
 	CDDM_calc_normals_mapping(explode);
 
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index 069fb653d28..0aea2650895 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -306,7 +306,7 @@ static DerivedMesh *fluidsim_read_obj(const char *filename)
 
 	gzclose( gzf );
 
-	CDDM_calc_edges(dm);
+	CDDM_calc_edges_tessface(dm);
 
 	CDDM_apply_vert_normals(dm, (short (*)[3])normals);
 	MEM_freeN(normals);
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index 03285fd65f7..2910fd515ec 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -348,7 +348,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd)
 		}
 	}
 
-	CDDM_calc_edges_poly(result);
+	CDDM_calc_edges(result);
 
 	/* add uvs */
 	cdlayer= CustomData_number_of_layers(&result->loopData, CD_MLOOPUV);
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 56f7ce37c26..aaa3088f747 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -303,7 +303,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob,
 			mf->v4+=(i/totface)*totvert;
 	}
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 	CDDM_calc_normals_mapping(result);
 
 	if(psys->lattice){
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 2852c4b90bb..f1f09e1db1e 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -186,7 +186,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
 	CDDM_lower_num_tessfaces(result, output->curface);
 	MEM_freeN(output);
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 	CDDM_calc_normals_mapping(result);
 
 	/* BMESH_TODO - create polygons */