diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
| commit | c7c10e5e283879961356050ba8a965d2239456b8 (patch) | |
| tree | d89d06ca30d51087a9d958f66bbf240bd3c7807e /release | |
| parent | e0cf86a9e219dcd71e5d67b8f2999d41e7f8c492 (diff) | |
Brush Texture Angle Goodies:
This commit includes a few things:
* It moves the Rake and Random flags from the brush to the MTex.
* The first change allows mask textures to have independent rake
support.
* Random rotation now has an angle value that controls the width of the
effect from the rake or default angle
* Rake and Random are now supported together.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index f1042856e4c..49634982beb 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -246,21 +246,20 @@ def brush_texture_settings(layout, brush, sculpt): if brush.brush_capabilities.has_texture_angle: col = layout.column() col.label(text="Angle:") - row = col.row(align=True) if brush.brush_capabilities.has_texture_angle_source: + col.prop(tex_slot, "angle", text="") + col.prop(tex_slot, "use_rake", text="Rake") + if brush.brush_capabilities.has_random_texture_angle: if sculpt: if brush.sculpt_capabilities.has_random_texture_angle: - row.prop(brush, "texture_angle_source_random", text="") - else: - row.prop(brush, "texture_angle_source_no_random", text="") - + col.prop(tex_slot, "use_random", text="Random") + if tex_slot.use_random: + col.prop(tex_slot, "random_angle", text="") else: - row.prop(brush, "texture_angle_source_random", text="") - else: - row.prop(brush, "texture_angle_source_no_random", text="") - - row.prop(tex_slot, "angle", text="") + col.prop(tex_slot, "use_random", text="Random") + if tex_slot.use_random: + col.prop(tex_slot, "random_angle", text="") # scale and offset split = layout.split() @@ -290,9 +289,18 @@ def brush_mask_texture_settings(layout, brush): col = layout.column() col.prop(brush, "use_pressure_masking", text="") - col.label(text="Angle:") - col.active = brush.brush_capabilities.has_texture_angle - col.prop(mask_tex_slot, "angle", text="") + # angle and texture_angle_source + if brush.brush_capabilities.has_texture_angle: + col = layout.column() + col.label(text="Angle:") + if brush.brush_capabilities.has_texture_angle_source: + col.prop(mask_tex_slot, "angle", text="") + col.prop(mask_tex_slot, "use_rake", text="Rake") + + if brush.brush_capabilities.has_random_texture_angle: + col.prop(mask_tex_slot, "use_random", text="Random") + if mask_tex_slot.use_random: + col.prop(mask_tex_slot, "random_angle", text="") # scale and offset split = layout.split() |