diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2014-07-17 17:20:22 +0400 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2014-07-17 17:20:22 +0400 |
commit | 70453c578dcdce5577015e1cd7be99d1b810215d (patch) | |
tree | a0e4a6a3e82b8dd9012ca9a6b8ce70ef011e9139 /source/blender/makesdna/DNA_modifier_types.h | |
parent | 737cb8cf7c6e52ed7eef159b06df247be7d3406f (diff) |
Fix T34664: bevel face material can be set in tool and modifier.
Now the bevel tool, modifier, and internal operator have a material
slot # parameter that the user can set. If left at default of -1,
behavior is as current -- bevel face material is taken from the
closest original face (this may be ambiguous). If material slot
is >= 0, it gives the material slot index number for the material
to use.
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 7c5846e5819..2bd33ae60f2 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -308,6 +308,9 @@ typedef struct BevelModifierData { short val_flags; /* used to interpret the bevel value */ short lim_flags; /* flags to tell the tool how to limit the bevel */ short e_flags; /* flags to direct how edge weights are applied to verts */ + short mat; /* material index if >= 0, else material inherited from surrounding faces */ + short pad; + int pad2; float profile; /* controls profile shape (0->1, .5 is round) */ /* if the MOD_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */ float bevel_angle; |