[Bf-blender-cvs] [c8c3bbaadee] blender2.8: Cleanup: naming

[Campbell Barton]

Commit: c8c3bbaadeeb469a83f8b3ae47599f28fa94ad30
Author: Campbell Barton
Date:   Tue Oct 9 12:23:22 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc8c3bbaadeeb469a83f8b3ae47599f28fa94ad30

Cleanup: naming

Rename DerivedMesh modifier functions to make room for mesh versions.

===================================================================

M	source/blender/blenkernel/BKE_modifier.h
M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/modifier.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index eb08db93bd0..ee5a76302db 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -424,20 +424,20 @@ const char *modifier_path_relbase_from_global(struct Object *ob);
 
 /* wrappers for modifier callbacks that ensure valid normals */
 
-struct DerivedMesh *modwrap_applyModifier(
+struct DerivedMesh *modwrap_applyModifier_DM_deprecated(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct DerivedMesh *dm);
 
-struct DerivedMesh *modwrap_applyModifierEM(
+struct DerivedMesh *modwrap_applyModifierEM_DM_deprecated(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct BMEditMesh *em, struct DerivedMesh *dm);
 
-void modwrap_deformVerts(
+void modwrap_deformVerts_DM_deprecated(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct DerivedMesh *dm,
         float (*vertexCos)[3], int numVerts);
 
-void modwrap_deformVertsEM(
+void modwrap_deformVertsEM_DM_deprecated(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct BMEditMesh *em, struct DerivedMesh *dm,
         float (*vertexCos)[3], int numVerts);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 4c55591db31..605ffb41344 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2071,9 +2071,9 @@ static void editbmesh_calc_modifiers(
 			}
 
 			if (mti->deformVertsEM)
-				modwrap_deformVertsEM(md, &mectx, em, dm, deformedVerts, numVerts);
+				modwrap_deformVertsEM_DM_deprecated(md, &mectx, em, dm, deformedVerts, numVerts);
 			else
-				modwrap_deformVerts(md, &mectx, dm, deformedVerts, numVerts);
+				modwrap_deformVerts_DM_deprecated(md, &mectx, dm, deformedVerts, numVerts);
 		}
 		else {
 			DerivedMesh *ndm;
@@ -2114,10 +2114,10 @@ static void editbmesh_calc_modifiers(
 				DM_set_only_copy(orcodm, mask | CD_MASK_ORIGINDEX);
 
 				if (mti->applyModifierEM) {
-					ndm = modwrap_applyModifierEM(md, &mectx_orco, em, orcodm);
+					ndm = modwrap_applyModifierEM_DM_deprecated(md, &mectx_orco, em, orcodm);
 				}
 				else {
-					ndm = modwrap_applyModifier(md, &mectx_orco, orcodm);
+					ndm = modwrap_applyModifier_DM_deprecated(md, &mectx_orco, orcodm);
 				}
 				ASSERT_IS_VALID_DM(ndm);
 
@@ -2142,9 +2142,9 @@ static void editbmesh_calc_modifiers(
 			}
 
 			if (mti->applyModifierEM)
-				ndm = modwrap_applyModifierEM(md, &mectx_cache, em, dm);
+				ndm = modwrap_applyModifierEM_DM_deprecated(md, &mectx_cache, em, dm);
 			else
-				ndm = modwrap_applyModifier(md, &mectx_cache, dm);
+				ndm = modwrap_applyModifier_DM_deprecated(md, &mectx_cache, dm);
 			ASSERT_IS_VALID_DM(ndm);
 
 			if (ndm) {
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 1863e454397..d9d3730b29f 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -826,7 +826,7 @@ void modifier_path_init(char *path, int path_maxlen, const char *name)
 
 /* wrapper around ModifierTypeInfo.applyModifier that ensures valid normals */
 
-struct DerivedMesh *modwrap_applyModifier(
+struct DerivedMesh *modwrap_applyModifier_DM_deprecated(
         ModifierData *md, const ModifierEvalContext *ctx,
         struct DerivedMesh *dm)
 {
@@ -839,7 +839,7 @@ struct DerivedMesh *modwrap_applyModifier(
 	return modifier_applyModifier_DM_deprecated(md, ctx, dm);
 }
 
-struct DerivedMesh *modwrap_applyModifierEM(
+struct DerivedMesh *modwrap_applyModifierEM_DM_deprecated(
         ModifierData *md, const ModifierEvalContext *ctx,
         struct BMEditMesh *em, DerivedMesh *dm)
 {
@@ -852,7 +852,7 @@ struct DerivedMesh *modwrap_applyModifierEM(
 	return modifier_applyModifierEM_DM_deprecated(md, ctx, em, dm);
 }
 
-void modwrap_deformVerts(
+void modwrap_deformVerts_DM_deprecated(
         ModifierData *md, const ModifierEvalContext *ctx,
         DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
 {
@@ -865,7 +865,7 @@ void modwrap_deformVerts(
 	modifier_deformVerts_DM_deprecated(md, ctx, dm, vertexCos, numVerts);
 }
 
-void modwrap_deformVertsEM(
+void modwrap_deformVertsEM_DM_deprecated(
         ModifierData *md, const ModifierEvalContext *ctx,
         struct BMEditMesh *em, DerivedMesh *dm,
         float (*vertexCos)[3], int numVerts)