[Bf-blender-cvs] [2c5a9192129] master: Cleanup: remove unused modifier methods.
Brecht Van Lommel
noreply at git.blender.org
Sat Mar 30 20:37:59 CET 2019
Commit: 2c5a91921293325696c34e56755c85126ee0760f
Author: Brecht Van Lommel
Date: Sat Mar 30 19:16:44 2019 +0100
Branches: master
https://developer.blender.org/rB2c5a91921293325696c34e56755c85126ee0760f
Cleanup: remove unused modifier methods.
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_none.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shapekey.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smoke.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 683c932731d..a375ed3044c 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -28,7 +28,6 @@ struct BMEditMesh;
struct CustomData_MeshMasks;
struct DepsNodeHandle;
struct Depsgraph;
-struct DerivedMesh;
struct ID;
struct ListBase;
struct Main;
@@ -155,17 +154,6 @@ typedef struct ModifierTypeInfo {
void (*copyData)(const struct ModifierData *md, struct ModifierData *target, const int flag);
- /********************* Deform modifier functions *********************/ /* DEPRECATED */
-
- void (*deformVerts_DM_removed)(void);
- void (*deformMatrices_DM_removed)(void);
- void (*deformVertsEM_DM_removed)(void);
- void (*deformMatricesEM_DM_removed)(void);
-
- /********************* Non-deform modifier functions *********************/ /* DEPRECATED */
-
- void (*applyModifier_DM_removed)(void);
-
/********************* Deform modifier functions *********************/
/* Only for deform types, should apply the deformation
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index acd4573ec44..bc933e9b6ba 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -182,12 +182,6 @@ ModifierTypeInfo modifierType_Armature = {
/* copyData */ copyData,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ deformMatrices,
/* deformVertsEM */ deformVertsEM,
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index e45a46c54b9..2af89b00c16 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -755,12 +755,6 @@ ModifierTypeInfo modifierType_Array = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 01f307c45de..567c74effe0 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -217,12 +217,6 @@ ModifierTypeInfo modifierType_Bevel = {
/* copyData */ copyData,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 250a6d73953..c225fe80b37 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -338,12 +338,6 @@ ModifierTypeInfo modifierType_Boolean = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index c8106605077..01478c855bb 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -293,12 +293,6 @@ ModifierTypeInfo modifierType_Build = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 44ca565b807..ec0aa4361f4 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -474,12 +474,6 @@ ModifierTypeInfo modifierType_Cast = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index abbd32f70d3..8bf9d50cda7 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -241,12 +241,6 @@ ModifierTypeInfo modifierType_Cloth = {
/* copyData */ copyData,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 87775cb5f3b..371a33ebfc6 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -251,12 +251,6 @@ ModifierTypeInfo modifierType_Collision = {
/* copyData */ NULL,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 2c9ace65024..ac1c0d46d7b 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -743,12 +743,6 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/* copyData */ copyData,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index 4f722626a9b..6242ef674ba 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -152,12 +152,6 @@ ModifierTypeInfo modifierType_Curve = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index c06c190c7b8..a8e4fe41a04 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -218,12 +218,6 @@ ModifierTypeInfo modifierType_DataTransfer = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index b621b168ccc..40968f1173f 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -225,12 +225,6 @@ ModifierTypeInfo modifierType_Decimate = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index e199b4b362e..c95bded12af 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -406,12 +406,6 @@ ModifierTypeInfo modifierType_Displace = {
/* copyData */ modifier_copyData_generic,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 5a881683e80..badf3df6b1d 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -179,12 +179,6 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* copyData */ copyData,
- /* deformVerts_DM */ NULL,
- /* deformMatrices_DM */ NULL,
- /* deformVertsEM_DM */ NULL,
- /* deformMatricesEM_DM*/NULL,
- /* applyModifier_DM */ NULL,
-
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index b8dda4d9103..751a70916ab 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -146,12 +146,6 @@ ModifierTypeInfo modifierType_Edg
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list