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/makesrna/intern | |
| 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/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index a998da661f1..fb7601064cf 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2239,6 +2239,13 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0.15f, 1.0f, 0.05, 2); RNA_def_property_ui_text(prop, "Profile", "The profile shape (0.5 = round)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); + + prop = RNA_def_property(srna, "material", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "mat"); + RNA_def_property_range(prop, -1, SHRT_MAX); + RNA_def_property_ui_text(prop, "Material", "Material index of generated faces, -1 for automatic"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); + } static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) |