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/bmesh/intern/bmesh_opdefines.c | |
| 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/bmesh/intern/bmesh_opdefines.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 7c77302c942..b9da7618df8 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1580,6 +1580,7 @@ static BMOpDefine bmo_bevel_def = { {"segments", BMO_OP_SLOT_INT}, /* number of segments in bevel */ {"profile", BMO_OP_SLOT_FLT}, /* profile shape, 0->1 (.5=>round) */ {"vertex_only", BMO_OP_SLOT_BOOL}, /* only bevel vertices, not edges */ + {"material", BMO_OP_SLOT_INT}, /* material for bevel faces, -1 means get from adjacent faces */ {{'\0'}}, }, /* slots_out */ |