diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-02-03 12:02:36 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-02-03 12:02:36 +0300 |
commit | b9483ea38026095890cbb5fedff96a3bb0f40e2f (patch) | |
tree | f68ba60e7857bc1c7fd6dc659efc85b4b4c22b76 /source/blender/makesdna | |
parent | e468abc360e0c9889949b4814551e282e926240d (diff) | |
parent | c8cca888518182914e6b4f1b98e0f7b861add08d (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 7 |
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, |