Fix T76498: Refactoring - Rename BKE modifiers funtions

1 files changed, 107 insertions, 122 deletions

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 4b05f4635a2..b3844d49cf6 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -59,7 +59,7 @@
 #include "BKE_multires.h"
 #include "BKE_object.h"
 
-/* may move these, only for modifier_path_relbase */
+/* may move these, only for BKE_modifier_path_relbase */
 #include "BKE_main.h"
 /* end */
 
@@ -82,21 +82,21 @@ void BKE_modifier_init(void)
   modifier_type_init(modifier_types); /* MOD_utils.c */
 
   /* Initialize global cmmon storage used for virtual modifier list */
-  md = modifier_new(eModifierType_Armature);
+  md = BKE_modifier_new(eModifierType_Armature);
   virtualModifierCommonData.amd = *((ArmatureModifierData *)md);
-  modifier_free(md);
+  BKE_modifier_free(md);
 
-  md = modifier_new(eModifierType_Curve);
+  md = BKE_modifier_new(eModifierType_Curve);
   virtualModifierCommonData.cmd = *((CurveModifierData *)md);
-  modifier_free(md);
+  BKE_modifier_free(md);
 
-  md = modifier_new(eModifierType_Lattice);
+  md = BKE_modifier_new(eModifierType_Lattice);
   virtualModifierCommonData.lmd = *((LatticeModifierData *)md);
-  modifier_free(md);
+  BKE_modifier_free(md);
 
-  md = modifier_new(eModifierType_ShapeKey);
+  md = BKE_modifier_new(eModifierType_ShapeKey);
   virtualModifierCommonData.smd = *((ShapeKeyModifierData *)md);
-  modifier_free(md);
+  BKE_modifier_free(md);
 
   virtualModifierCommonData.amd.modifier.mode |= eModifierMode_Virtual;
   virtualModifierCommonData.cmd.modifier.mode |= eModifierMode_Virtual;
@@ -104,7 +104,7 @@ void BKE_modifier_init(void)
   virtualModifierCommonData.smd.modifier.mode |= eModifierMode_Virtual;
 }
 
-const ModifierTypeInfo *modifierType_getInfo(ModifierType type)
+const ModifierTypeInfo *BKE_modifier_get_info(ModifierType type)
 {
   /* type unsigned, no need to check < 0 */
   if (type < NUM_MODIFIER_TYPES && modifier_types[type] && modifier_types[type]->name[0] != '\0') {
@@ -117,9 +117,9 @@ const ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 
 /***/
 
-ModifierData *modifier_new(int type)
+ModifierData *BKE_modifier_new(int type)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(type);
   ModifierData *md = MEM_callocN(mti->structSize, mti->structName);
 
   /* note, this name must be made unique later */
@@ -151,9 +151,9 @@ static void modifier_free_data_id_us_cb(void *UNUSED(userData),
   }
 }
 
-void modifier_free_ex(ModifierData *md, const int flag)
+void BKE_modifier_free_ex(ModifierData *md, const int flag)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
     if (mti->foreachIDLink) {
@@ -174,15 +174,15 @@ void modifier_free_ex(ModifierData *md, const int flag)
   MEM_freeN(md);
 }
 
-void modifier_free(ModifierData *md)
+void BKE_modifier_free(ModifierData *md)
 {
-  modifier_free_ex(md, 0);
+  BKE_modifier_free_ex(md, 0);
 }
 
-bool modifier_unique_name(ListBase *modifiers, ModifierData *md)
+bool BKE_modifier_unique_name(ListBase *modifiers, ModifierData *md)
 {
   if (modifiers && md) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
     return BLI_uniquename(
         modifiers, md, DATA_(mti->name), '.', offsetof(ModifierData, name), sizeof(md->name));
@@ -190,24 +190,24 @@ bool modifier_unique_name(ListBase *modifiers, ModifierData *md)
   return false;
 }
 
-bool modifier_dependsOnTime(ModifierData *md)
+bool BKE_modifier_depends_ontime(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   return mti->dependsOnTime && mti->dependsOnTime(md);
 }
 
-bool modifier_supportsMapping(ModifierData *md)
+bool BKE_modifier_supports_mapping(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   return (mti->type == eModifierTypeType_OnlyDeform ||
           (mti->flags & eModifierTypeFlag_SupportsMapping));
 }
 
-bool modifier_isPreview(ModifierData *md)
+bool BKE_modifier_is_preview(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   /* Constructive modifiers are highly likely to also modify data like vgroups or vcol! */
   if (!((mti->flags & eModifierTypeFlag_UsesPreview) ||
@@ -222,7 +222,7 @@ bool modifier_isPreview(ModifierData *md)
   return false;
 }
 
-ModifierData *modifiers_findByType(Object *ob, ModifierType type)
+ModifierData *BKE_modifiers_findby_type(Object *ob, ModifierType type)
 {
   ModifierData *md = ob->modifiers.first;
 
@@ -235,12 +235,12 @@ ModifierData *modifiers_findByType(Object *ob, ModifierType type)
   return md;
 }
 
-ModifierData *modifiers_findByName(Object *ob, const char *name)
+ModifierData *BKE_modifiers_findny_name(Object *ob, const char *name)
 {
   return BLI_findstring(&(ob->modifiers), name, offsetof(ModifierData, name));
 }
 
-void modifiers_clearErrors(Object *ob)
+void BKE_modifiers_clear_errors(Object *ob)
 {
   ModifierData *md = ob->modifiers.first;
   /* int qRedraw = 0; */
@@ -255,12 +255,12 @@ void modifiers_clearErrors(Object *ob)
   }
 }
 
-void modifiers_foreachObjectLink(Object *ob, ObjectWalkFunc walk, void *userData)
+void BKE_modifiers_foreach_object_link(Object *ob, ObjectWalkFunc walk, void *userData)
 {
   ModifierData *md = ob->modifiers.first;
 
   for (; md; md = md->next) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
     if (mti->foreachObjectLink) {
       mti->foreachObjectLink(md, ob, walk, userData);
@@ -268,12 +268,12 @@ void modifiers_foreachObjectLink(Object *ob, ObjectWalkFunc walk, void *userData
   }
 }
 
-void modifiers_foreachIDLink(Object *ob, IDWalkFunc walk, void *userData)
+void BKE_modifiers_foreach_ID_link(Object *ob, IDWalkFunc walk, void *userData)
 {
   ModifierData *md = ob->modifiers.first;
 
   for (; md; md = md->next) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
     if (mti->foreachIDLink) {
       mti->foreachIDLink(md, ob, walk, userData);
@@ -286,12 +286,12 @@ void modifiers_foreachIDLink(Object *ob, IDWalkFunc walk, void *userData)
   }
 }
 
-void modifiers_foreachTexLink(Object *ob, TexWalkFunc walk, void *userData)
+void BKE_modifiers_foreach_tex_link(Object *ob, TexWalkFunc walk, void *userData)
 {
   ModifierData *md = ob->modifiers.first;
 
   for (; md; md = md->next) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
     if (mti->foreachTexLink) {
       mti->foreachTexLink(md, ob, walk, userData);
@@ -302,11 +302,11 @@ void modifiers_foreachTexLink(Object *ob, TexWalkFunc walk, void *userData)
 /* callback's can use this
  * to avoid copying every member.
  */
-void modifier_copyData_generic(const ModifierData *md_src,
+void BKE_modifier_copydata_generic(const ModifierData *md_src,
                                ModifierData *md_dst,
                                const int UNUSED(flag))
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md_src->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md_src->type);
 
   /* md_dst may have already be fully initialized with some extra allocated data,
    * we need to free it now to avoid memleak. */
@@ -335,9 +335,9 @@ static void modifier_copy_data_id_us_cb(void *UNUSED(userData),
   }
 }
 
-void modifier_copyData_ex(ModifierData *md, ModifierData *target, const int flag)
+void BKE_modifier_copydata_ex(ModifierData *md, ModifierData *target, const int flag)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   target->mode = md->mode;
   target->flag = md->flag;
@@ -356,40 +356,40 @@ void modifier_copyData_ex(ModifierData *md, ModifierData *target, const int flag
   }
 }
 
-void modifier_copyData(ModifierData *md, ModifierData *target)
+void BKE_modifier_copydata(ModifierData *md, ModifierData *target)
 {
-  modifier_copyData_ex(md, target, 0);
+  BKE_modifier_copydata_ex(md, target, 0);
 }
 
-bool modifier_supportsCage(struct Scene *scene, ModifierData *md)
+bool BKE_modifier_supports_cage(struct Scene *scene, ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   return ((!mti->isDisabled || !mti->isDisabled(scene, md, 0)) &&
-          (mti->flags & eModifierTypeFlag_SupportsEditmode) && modifier_supportsMapping(md));
+          (mti->flags & eModifierTypeFlag_SupportsEditmode) && BKE_modifier_supports_mapping(md));
 }
 
-bool modifier_couldBeCage(struct Scene *scene, ModifierData *md)
+bool BKE_modifier_couldbe_cage(struct Scene *scene, ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   return ((md->mode & eModifierMode_Realtime) && (md->mode & eModifierMode_Editmode) &&
-          (!mti->isDisabled || !mti->isDisabled(scene, md, 0)) && modifier_supportsMapping(md));
+          (!mti->isDisabled || !mti->isDisabled(scene, md, 0)) && BKE_modifier_supports_mapping(md));
 }
 
-bool modifier_isSameTopology(ModifierData *md)
+bool BKE_modifier_is_same_topology(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   return ELEM(mti->type, eModifierTypeType_OnlyDeform, eModifierTypeType_NonGeometrical);
 }
 
-bool modifier_isNonGeometrical(ModifierData *md)
+bool BKE_modifier_is_non_geometrical(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   return (mti->type == eModifierTypeType_NonGeometrical);
 }
 
-void modifier_setError(ModifierData *md, const char *_format, ...)
+void BKE_modifier_set_error(ModifierData *md, const char *_format, ...)
 {
   char buffer[512];
   va_list ap;
@@ -416,13 +416,13 @@ void modifier_setError(ModifierData *md, const char *_format, ...)
  * then is NULL)
  * also used for some mesh tools to give warnings
  */
-int modifiers_getCageIndex(struct Scene *scene,
+int BKE_modifiers_get_cage_index(struct Scene *scene,
                            Object *ob,
                            int *r_lastPossibleCageIndex,
                            bool is_virtual)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = (is_virtual) ? modifiers_getVirtualModifierList(ob, &virtualModifierData) :
+  ModifierData *md = (is_virtual) ? BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData) :
                                     ob->modifiers.first;
   int i, cageIndex = -1;
 
@@ -433,7 +433,7 @@ int modifiers_getCageIndex(struct Scene *scene,
 
   /* Find the last modifier acting on the cage. */
   for (i = 0; md; i++, md = md->next) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
     bool supports_mapping;
 
     if (mti->isDisabled && mti->isDisabled(scene, md, 0)) {
@@ -446,7 +446,7 @@ int modifiers_getCageIndex(struct Scene *scene,
       continue;
     }
 
-    supports_mapping = modifier_supportsMapping(md);
+    supports_mapping = BKE_modifier_supports_mapping(md);
     if (r_lastPossibleCageIndex && supports_mapping) {
       *r_lastPossibleCageIndex = i;
     }
@@ -470,30 +470,30 @@ int modifiers_getCageIndex(struct Scene *scene,
   return cageIndex;
 }
 
-bool modifiers_isSoftbodyEnabled(Object *ob)
+bool BKE_modifiers_is_softbody_enabled(Object *ob)
 {
-  ModifierData *md = modifiers_findByType(ob, eModifierType_Softbody);
+  ModifierData *md = BKE_modifiers_findby_type(ob, eModifierType_Softbody);
 
   return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render));
 }
 
-bool modifiers_isClothEnabled(Object *ob)
+bool BKE_modifiers_is_cloth_enabled(Object *ob)
 {
-  ModifierData *md = modifiers_findByType(ob, eModifierType_Cloth);
+  ModifierData *md = BKE_modifiers_findby_type(ob, eModifierType_Cloth);
 
   return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render));
 }
 
-bool modifiers_isModifierEnabled(Object *ob, int modifierType)
+bool BKE_modifiers_is_modifier_enabled(Object *ob, int modifierType)
 {
-  ModifierData *md = modifiers_findByType(ob, modifierType);
+  ModifierData *md = BKE_modifiers_findby_type(ob, modifierType);
 
   return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render));
 }
 
-bool modifiers_isParticleEnabled(Object *ob)
+bool BKE_modifiers_is_particle_enabled(Object *ob)
 {
-  ModifierData *md = modifiers_findByType(ob, eModifierType_ParticleSystem);
+  ModifierData *md = BKE_modifiers_findby_type(ob, eModifierType_ParticleSystem);
 
   return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render));
 }
@@ -504,9 +504,9 @@ bool modifiers_isParticleEnabled(Object *ob)
  * \param scene: Current scene, may be NULL,
  * in which case isDisabled callback of the modifier is never called.
  */
-bool modifier_isEnabled(const struct Scene *scene, ModifierData *md, int required_mode)
+bool BKE_modifier_is_enabled(const struct Scene *scene, ModifierData *md, int required_mode)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   if ((md->mode & required_mode) != required_mode) {
     return false;
@@ -526,7 +526,7 @@ bool modifier_isEnabled(const struct Scene *scene, ModifierData *md, int require
   return true;
 }
 
-CDMaskLink *modifiers_calcDataMasks(struct Scene *scene,
+CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
                                     Object *ob,
                                     ModifierData *md,
                                     CustomData_MeshMasks *final_datamask,
@@ -540,11 +540,11 @@ CDMaskLink *modifiers_calcDataMasks(struct Scene *scene,
 
   /* build a list of modifier data requirements in reverse order */
   for (; md; md = md->next) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
     curr = MEM_callocN(sizeof(CDMaskLink), "CDMaskLink");
 
-    if (modifier_isEnabled(scene, md, required_mode)) {
+    if (BKE_modifier_is_enabled(scene, md, required_mode)) {
       if (mti->type == eModifierTypeType_OnlyDeform) {
         have_deform_modifier = true;
       }
@@ -594,7 +594,7 @@ CDMaskLink *modifiers_calcDataMasks(struct Scene *scene,
   return dataMasks;
 }
 
-ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, int required_mode)
+ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, ModifierData *md, int required_mode)
 {
   ModifierData *tmp_md = NULL;
 
@@ -604,7 +604,7 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in
 
   /* Find the latest modifier in stack generating preview. */
   for (; md; md = md->next) {
-    if (modifier_isEnabled(scene, md, required_mode) && modifier_isPreview(md)) {
+    if (BKE_modifier_is_enabled(scene, md, required_mode) && BKE_modifier_is_preview(md)) {
       tmp_md = md;
     }
   }
@@ -613,7 +613,7 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in
 
 /* This is to include things that are not modifiers in the evaluation of the modifier stack, for
  * example parenting to an armature. */
-ModifierData *modifiers_getVirtualModifierList(const Object *ob,
+ModifierData *BKE_modifiers_get_virtual_modifierlist(const Object *ob,
                                                VirtualModifierData *virtualModifierData)
 {
   ModifierData *md;
@@ -661,10 +661,10 @@ ModifierData *modifiers_getVirtualModifierList(const Object *ob,
 /* Takes an object and returns its first selected armature, else just its armature
  * This should work for multiple armatures per object
  */
-Object *modifiers_isDeformedByArmature(Object *ob)
+Object *BKE_modifiers_is_deformed_by_armature(Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   ArmatureModifierData *amd = NULL;
 
   /* return the first selected armature, this lets us use multiple armatures */
@@ -684,10 +684,10 @@ Object *modifiers_isDeformedByArmature(Object *ob)
   return NULL;
 }
 
-Object *modifiers_isDeformedByMeshDeform(Object *ob)
+Object *BKE_modifiers_is_deformed_by_meshdeform(Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   MeshDeformModifierData *mdmd = NULL;
 
   /* return the first selected armature, this lets us use multiple armatures */
@@ -710,10 +710,10 @@ Object *modifiers_isDeformedByMeshDeform(Object *ob)
 /* Takes an object and returns its first selected lattice, else just its lattice
  * This should work for multiple lattices per object
  */
-Object *modifiers_isDeformedByLattice(Object *ob)
+Object *BKE_modifiers_is_deformed_by_lattice(Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   LatticeModifierData *lmd = NULL;
 
   /* return the first selected lattice, this lets us use multiple lattices */
@@ -736,10 +736,10 @@ Object *modifiers_isDeformedByLattice(Object *ob)
 /* Takes an object and returns its first selected curve, else just its curve
  * This should work for multiple curves per object
  */
-Object *modifiers_isDeformedByCurve(Object *ob)
+Object *BKE_modifiers_is_deformed_by_curve(Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   CurveModifierData *cmd = NULL;
 
   /* return the first selected curve, this lets us use multiple curves */
@@ -759,10 +759,10 @@ Object *modifiers_isDeformedByCurve(Object *ob)
   return NULL;
 }
 
-bool modifiers_usesMultires(Object *ob)
+bool BKE_modifiers_uses_multires(Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   MultiresModifierData *mmd = NULL;
 
   for (; md; md = md->next) {
@@ -776,10 +776,10 @@ bool modifiers_usesMultires(Object *ob)
   return false;
 }
 
-bool modifiers_usesArmature(Object *ob, bArmature *arm)
+bool BKE_modifiers_uses_armature(Object *ob, bArmature *arm)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
 
   for (; md; md = md->next) {
     if (md->type == eModifierType_Armature) {
@@ -793,13 +793,13 @@ bool modifiers_usesArmature(Object *ob, bArmature *arm)
   return false;
 }
 
-bool modifiers_usesSubsurfFacedots(struct Scene *scene, Object *ob)
+bool BKE_modifiers_uses_subsurf_facedots(struct Scene *scene, Object *ob)
 {
   /* Search (backward) in the modifier stack to find if we have a subsurf modifier (enabled) before
    * the last modifier displayed on cage (or if the subsurf is the last). */
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
-  int cage_index = modifiers_getCageIndex(scene, ob, NULL, 1);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
+  int cage_index = BKE_modifiers_get_cage_index(scene, ob, NULL, 1);
   if (cage_index == -1) {
     return false;
   }
@@ -809,10 +809,10 @@ bool modifiers_usesSubsurfFacedots(struct Scene *scene, Object *ob)
   }
   /* Now from this point, search for subsurf modifier. */
   for (; md; md = md->prev) {
-    const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
     if (md->type == eModifierType_Subsurf) {
       ModifierMode mode = eModifierMode_Realtime | eModifierMode_Editmode;
-      if (modifier_isEnabled(scene, md, mode)) {
+      if (BKE_modifier_is_enabled(scene, md, mode)) {
         return true;
       }
     }
@@ -828,48 +828,33 @@ bool modifiers_usesSubsurfFacedots(struct Scene *scene, Object *ob)
   return false;
 }
 
-bool modifier_isCorrectableDeformed(ModifierData *md)
+bool BKE_modifier_is_correctable_deformed(ModifierData *md)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   return mti->deformMatricesEM != NULL;
 }
 
-bool modifiers_isCorrectableDeformed(struct Scene *scene, Object *ob)
+bool BKE_modifiers_is_correctable_deformed(struct Scene *scene, Object *ob)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   int required_mode = eModifierMode_Realtime;
 
   if (ob->mode == OB_MODE_EDIT) {
     required_mode |= eModifierMode_Editmode;
   }
   for (; md; md = md->next) {
-    if (!modifier_isEnabled(scene, md, required_mode)) {
+    if (!BKE_modifier_is_enabled(scene, md, required_mode)) {
       /* pass */
     }
-    else if (modifier_isCorrectableDeformed(md)) {
+    else if (BKE_modifier_is_correctable_deformed(md)) {
       return true;
     }
   }
   return false;
 }
 
-/* Check whether the given object has a modifier in its stack that uses WEIGHT_MCOL CD layer
- * to preview something... Used by DynamicPaint and WeightVG currently. */
-bool modifiers_isPreview(Object *ob)
-{
-  ModifierData *md = ob->modifiers.first;
-
-  for (; md; md = md->next) {
-    if (modifier_isPreview(md)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-void modifier_freeTemporaryData(ModifierData *md)
+void BKE_modifier_free_temporary_data(ModifierData *md)
 {
   if (md->type == eModifierType_Armature) {
     ArmatureModifierData *amd = (ArmatureModifierData *)md;
@@ -882,7 +867,7 @@ void modifier_freeTemporaryData(ModifierData *md)
 }
 
 /* ensure modifier correctness when changing ob->data */
-void test_object_modifiers(Object *ob)
+void BKE_modifiers_test_object(Object *ob)
 {
   ModifierData *md;
 
@@ -913,7 +898,7 @@ void test_object_modifiers(Object *ob)
  * - else if the file has been saved return the blend file path.
  * - else if the file isn't saved and the ID isn't from a library, return the temp dir.
  */
-const char *modifier_path_relbase(Main *bmain, Object *ob)
+const char *BKE_modifier_path_relbase(Main *bmain, Object *ob)
 {
   if (G.relbase_valid || ID_IS_LINKED(ob)) {
     return ID_BLEND_PATH(bmain, &ob->id);
@@ -925,7 +910,7 @@ const char *modifier_path_relbase(Main *bmain, Object *ob)
   }
 }
 
-const char *modifier_path_relbase_from_global(Object *ob)
+const char *BKE_modifier_path_relbase_from_global(Object *ob)
 {
   if (G.relbase_valid || ID_IS_LINKED(ob)) {
     return ID_BLEND_PATH_FROM_GLOBAL(&ob->id);
@@ -938,7 +923,7 @@ const char *modifier_path_relbase_from_global(Object *ob)
 }
 
 /* initializes the path with either */
-void modifier_path_init(char *path, int path_maxlen, const char *name)
+void BKE_modifier_path_init(char *path, int path_maxlen, const char *name)
 {
   /* elubie: changed this to default to the same dir as the render output
    * to prevent saving to C:\ on Windows */
@@ -947,9 +932,9 @@ void modifier_path_init(char *path, int path_maxlen, const char *name)
 
 /* wrapper around ModifierTypeInfo.modifyMesh that ensures valid normals */
 
-struct Mesh *modwrap_modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct Mesh *me)
+struct Mesh *BKE_modifier_modify_mesh(ModifierData *md, const ModifierEvalContext *ctx, struct Mesh *me)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
 
   if (mti->dependsOnNormals && mti->dependsOnNormals(md)) {
@@ -958,13 +943,13 @@ struct Mesh *modwrap_modifyMesh(ModifierData *md, const ModifierEvalContext *ctx
   return mti->modifyMesh(md, ctx, me);
 }
 
-void modwrap_deformVerts(ModifierData *md,
+void BKE_modifier_deform_verts(ModifierData *md,
                          const ModifierEvalContext *ctx,
                          Mesh *me,
                          float (*vertexCos)[3],
                          int numVerts)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
 
   if (me && mti->dependsOnNormals && mti->dependsOnNormals(md)) {
@@ -973,14 +958,14 @@ void modwrap_deformVerts(ModifierData *md,
   mti->deformVerts(md, ctx, me, vertexCos, numVerts);
 }
 
-void modwrap_deformVertsEM(ModifierData *md,
+void BKE_modifier_deform_vertsEM(ModifierData *md,
                            const ModifierEvalContext *ctx,
                            struct BMEditMesh *em,
                            Mesh *me,
                            float (*vertexCos)[3],
                            int numVerts)
 {
-  const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+  const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
 
   if (me && mti->dependsOnNormals && mti->dependsOnNormals(md)) {
@@ -1023,7 +1008,7 @@ Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(Object *ob_eval,
   return me;
 }
 
-ModifierData *modifier_get_original(ModifierData *md)
+ModifierData *BKE_modifier_get_original(ModifierData *md)
 {
   if (md->orig_modifier_data == NULL) {
     return md;
@@ -1031,11 +1016,11 @@ ModifierData *modifier_get_original(ModifierData *md)
   return md->orig_modifier_data;
 }
 
-struct ModifierData *modifier_get_evaluated(Depsgraph *depsgraph, Object *object, ModifierData *md)
+struct ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph, Object *object, ModifierData *md)
 {
   Object *object_eval = DEG_get_evaluated_object(depsgraph, object);
   if (object_eval == object) {
     return md;
   }
-  return modifiers_findByName(object_eval, md->name);
+  return BKE_modifiers_findny_name(object_eval, md->name);
 }