diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 05:04:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 05:04:47 +0300 |
| commit | a0453dadf0685782ffb8ac6b3c6470a3d44c8a01 (patch) | |
| tree | e93f313f3dfaa12108a0c3e4a7e65d1738a95708 /source/blender/makesdna | |
| parent | d58cf8292c039a943efbecb5c5ac07ea160f3d0f (diff) | |
| parent | 6c892efdbc4d5882da9a2655b21e4f4c2559106b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 9f7b09b4a18..6f8793bf0f7 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -219,8 +219,9 @@ typedef struct MaskModifierData { struct Object *ob_arm; /* armature to use to in place of hardcoded vgroup */ char vgroup[64]; /* name of vertex group to use to mask, MAX_VGROUP_NAME */ - int mode; /* using armature or hardcoded vgroup */ - int flag; /* flags for various things */ + short mode; /* using armature or hardcoded vgroup */ + short flag; /* flags for various things */ + float threshold; } MaskModifierData; /* Mask Modifier -> mode */ |