diff options
author | Cody Winchester <CodyWinch> | 2020-02-12 14:38:43 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-12 14:43:02 +0300 |
commit | cc085e228de70563ed0b6870d23ef3bb531c4798 (patch) | |
tree | 8fa049420283d4ce8842d7ecb3833aa5ccf11cb0 /source/blender/makesdna/DNA_modifier_types.h | |
parent | 24b5d5aa61682d44376d28097fc0a8f9c5c397bb (diff) |
Modifiers: Vertex Weight Modifiers add invert vgroup option
Adds the invert vgroup mask option to the Vertex Weight modifiers.
These 3 modifiers share the same functions so they needed to be modified at the same time. They are all setup the same with the invert vgroup option being added. I had to add a flag to the Mix modifier but the others I use the existing flags.
Differential Revision: https://developer.blender.org/D6819
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 1b0b3d9e08e..82237a10d23 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1387,7 +1387,8 @@ typedef struct WeightVGEditModifierData { /* WeightVGEdit flags. */ enum { - /* (1 << 0), (1 << 1) and (1 << 2) are free for future use! */ + /* (1 << 0) and (1 << 1) are free for future use! */ + MOD_WVG_EDIT_INVERT_VGROUP_MASK = (1 << 2), /** Add vertices with higher weight than threshold to vgroup. */ MOD_WVG_EDIT_ADD2VG = (1 << 3), /** Remove vertices with lower weight than threshold from vgroup. */ @@ -1430,8 +1431,10 @@ typedef struct WeightVGMixModifierData { /** Name of the UV map. MAX_CUSTOMDATA_LAYER_NAME. */ char mask_tex_uvlayer_name[64]; + char flag; + /* Padding... */ - char _pad1[4]; + char _pad1[3]; } WeightVGMixModifierData; /* How second vgroup's weights affect first ones. */ @@ -1466,6 +1469,11 @@ enum { MOD_WVG_SET_AND = 5, }; +/* WeightVGMix->flag */ +enum { + MOD_WVG_MIX_INVERT_VGROUP_MASK = (1 << 0), +}; + typedef struct WeightVGProximityModifierData { ModifierData modifier; @@ -1522,6 +1530,7 @@ enum { MOD_WVG_PROXIMITY_GEOM_EDGES = (1 << 1), /* Use nearest faces of target obj, in MOD_WVG_PROXIMITY_GEOMETRY mode. */ MOD_WVG_PROXIMITY_GEOM_FACES = (1 << 2), + MOD_WVG_PROXIMITY_INVERT_VGROUP_MASK = (1 << 3), }; /* Defines common to all WeightVG modifiers. */ |