diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-04-13 03:55:11 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-04-13 03:55:11 +0400 |
commit | 7cf1d86e4adc4893485e34229ccbc0537931c929 (patch) | |
tree | 0a4dd4484a8a24efc71261ff1cd0be0081b43de7 /source | |
parent | 9d0b08365ff2f1f0b44c3c7621f80b71c5bb5b7f (diff) |
Allow rake/random brush rotation for random mapping mode. Some
interesting things can be accomplished this way, such as tiger stripes
for instance.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 7bf206add90..4e3ea817b11 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -181,9 +181,10 @@ static int rna_SculptToolCapabilities_has_random_texture_angle_get(PointerRNA *p static int rna_BrushCapabilities_has_random_texture_angle_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; - return (ELEM(br->mtex.brush_map_mode, + return (ELEM3(br->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, - MTEX_MAP_MODE_AREA) && + MTEX_MAP_MODE_AREA, + MTEX_MAP_MODE_RANDOM) && !(br->flag & BRUSH_ANCHORED)); } @@ -238,19 +239,21 @@ static int rna_SculptToolCapabilities_has_strength_get(PointerRNA *ptr) static int rna_BrushCapabilities_has_texture_angle_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; - return ELEM4(br->mtex.brush_map_mode, + return ELEM5(br->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_AREA, MTEX_MAP_MODE_TILED, - MTEX_MAP_MODE_STENCIL); + MTEX_MAP_MODE_STENCIL, + MTEX_MAP_MODE_RANDOM); } static int rna_BrushCapabilities_has_texture_angle_source_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; - return ELEM(br->mtex.brush_map_mode, + return ELEM3(br->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW, - MTEX_MAP_MODE_AREA); + MTEX_MAP_MODE_AREA, + MTEX_MAP_MODE_RANDOM); } static PointerRNA rna_Sculpt_sculpt_tool_capabilities_get(PointerRNA *ptr) |