Merge branch 'blender-v3.1-release'

1 files changed, 2 insertions, 5 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 1d0796bda8b..8e38d52a4d7 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -128,15 +128,11 @@ typedef struct ModifierData {
 
   char *error;
 
-  /** Pointer to a #ModifierData in the original domain. */
-  struct ModifierData *orig_modifier_data;
-
   /** Runtime field which contains unique identifier of the modifier. */
   SessionUUID session_uuid;
 
   /** Runtime field which contains runtime data which is specific to a modifier type. */
   void *runtime;
-  void *_pad1;
 } ModifierData;
 
 typedef enum {
@@ -1012,7 +1008,8 @@ typedef struct MeshDeformModifierData {
   float *bindcos;
 
   /* runtime */
-  void (*bindfunc)(struct MeshDeformModifierData *mmd,
+  void (*bindfunc)(struct Object *object,
+                   struct MeshDeformModifierData *mmd,
                    struct Mesh *cagemesh,
                    float *vertexcos,
                    int totvert,