rename CDDM_calc_normals() --> CDDM_calc_normals_mapping

18 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 0e1aa0f9473..3c599d6eafd 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -409,7 +409,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	result = arrayModifier_doArray(amd, md->scene, ob, dm, 0);
 
 	//if(result != dm)
-	//	CDDM_calc_normals(result);
+	//	CDDM_calc_normals_mapping(result);
 
 	return result;
 }
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 606b20d3ccd..57d8943f681 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -195,7 +195,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 	result = BME_bmesh_to_derivedmesh(bm,derivedData);
 	BME_free_mesh(bm);
 
-	CDDM_calc_normals(result);
+	CDDM_calc_normals_mapping(result);
 
 	return result;
 }
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index 63c83dcaf54..16b19e82e97 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -278,7 +278,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 		}
 	}
 
-	CDDM_calc_normals(result);
+	CDDM_calc_normals_mapping(result);
 	
 	BLI_ghash_free(vertHash, NULL, NULL);
 	BLI_ghash_free(edgeHash, NULL, NULL);
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 6c9bbd11e9c..78bc64be1cd 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -88,7 +88,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 	if(result)
 	{
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 		return result;
 	}
 	return dm;
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 99d608351d8..2de7400065f 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -132,7 +132,7 @@ static void deformVerts(ModifierData *md, Object *ob,
 		unsigned int numverts = 0;
 
 		CDDM_apply_vert_coords(dm, vertexCos);
-		CDDM_calc_normals(dm);
+		CDDM_calc_normals_mapping(dm);
 		
 		current_time = BKE_curframe(md->scene);
 		
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 7acdcd8a5fe..2984a387fd8 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -153,7 +153,7 @@ static DerivedMesh *applyModifier(
 	result = edgesplitModifier_do(emd, ob, derivedData);
 
 	if(result != derivedData)
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 
 	return result;
 }
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index e6e3ef2a0aa..4af4cc74b5b 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -953,7 +953,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd,
 	/* finalization */
 	CDDM_calc_edges(explode);
 	CDDM_tessfaces_to_faces(explode);
-	CDDM_calc_normals(explode);
+	CDDM_calc_normals_mapping(explode);
 
 	if(psmd->psys->lattice){
 		end_latt_deform(psmd->psys->lattice);
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index fe6ddb03c64..069fb653d28 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -311,7 +311,7 @@ static DerivedMesh *fluidsim_read_obj(const char *filename)
 	CDDM_apply_vert_normals(dm, (short (*)[3])normals);
 	MEM_freeN(normals);
 
-	// CDDM_calc_normals(result);
+	// CDDM_calc_normals_mapping(result);
 
 	return dm;
 }
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c
index edef19fd032..b4f76ede545 100644
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -402,7 +402,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 	/* why is this needed? - campbell */
 	/* recalculate normals */
-	CDDM_calc_normals(result);
+	CDDM_calc_normals_mapping(result);
 	
 	/* free hashes */
 	BLI_ghash_free(vertHash, NULL, NULL);
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 37800d3cce5..70e7d6c0d48 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -320,7 +320,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	result = mirrorModifier__doMirror(mmd, ob, derivedData);
 
 	if(result != derivedData)
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 	
 	return result;
 }
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index f5e5c175972..03285fd65f7 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -541,7 +541,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	result = doOcean(md, ob, derivedData, 0);
 
 	if(result != derivedData)
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 
 	return result;
 }
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 3f8f44bdfd9..56f7ce37c26 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -304,7 +304,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob,
 	}
 
 	CDDM_calc_edges(result);
-	CDDM_calc_normals(result);
+	CDDM_calc_normals_mapping(result);
 
 	if(psys->lattice){
 		end_latt_deform(psys->lattice);
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index 4021a8a8114..42061222156 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -166,7 +166,7 @@ static void deformVerts(ModifierData *md, Object *ob,
 	/* make new dm */
 	psmd->dm=CDDM_copy(dm, 0);
 	CDDM_apply_vert_coords(psmd->dm, vertexCos);
-	CDDM_calc_normals(psmd->dm);
+	CDDM_calc_normals_mapping(psmd->dm);
 
 	if(needsFree){
 		dm->needsFree = 1;
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 26e7f8fdbb1..2852c4b90bb 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -187,7 +187,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
 	MEM_freeN(output);
 
 	CDDM_calc_edges(result);
-	CDDM_calc_normals(result);
+	CDDM_calc_normals_mapping(result);
 
 	/* BMESH_TODO - create polygons */
 
@@ -198,7 +198,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
 #else /* BMESH ONLY */
 
 	dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/
-	CDDM_calc_normals(dm);
+	CDDM_calc_normals_mapping(dm);
 	result->needsFree = 1;
 	result->release(result);
 
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 8ff4080b99b..c5d99a939b9 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -906,7 +906,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 	if((ltmd->flag & MOD_SCREW_NORMAL_CALC) == 0) {
 		/* BMESH_TODO, we only need to get vertex normals here, this is way overkill */
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 	}
 
 	return result;
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 0248bf6682a..e32d788f602 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -726,7 +726,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	/* must recalculate normals with vgroups since they can displace unevenly [#26888] */
 	if(dvert) {
 		/* BMESH_TODO, we only need to get vertex normals here, this is way overkill */
-		CDDM_calc_normals(result);
+		CDDM_calc_normals_mapping(result);
 	}
 	
 	if (dm != odm) {
diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c
index 161bdcaf4ac..830cdb9ebb0 100644
--- a/source/blender/modifiers/intern/MOD_surface.c
+++ b/source/blender/modifiers/intern/MOD_surface.c
@@ -116,7 +116,7 @@ static void deformVerts(ModifierData *md, Object *ob,
 		MVert *x, *v;
 
 		CDDM_apply_vert_coords(surmd->dm, vertexCos);
-		CDDM_calc_normals(surmd->dm);
+		CDDM_calc_normals_mapping(surmd->dm);
 		
 		numverts = surmd->dm->getNumVerts ( surmd->dm );
 
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 85172c3527c..5a1eb6daae2 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -173,7 +173,7 @@ DerivedMesh *get_cddm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float
 	}
 
 	if(dm)
-		CDDM_calc_normals(dm);
+		CDDM_calc_normals_mapping(dm);
 	
 	return dm;
 }
@@ -190,7 +190,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float (*
 
 		if(vertexCos) {
 			CDDM_apply_vert_coords(dm, vertexCos);
-			//CDDM_calc_normals(dm);
+			//CDDM_calc_normals_mapping(dm);
 		}
 		
 		if(orco)