[Bf-blender-cvs] [09e5373] master: Paint: Descrollification commit for brush texture angle property.
Antony Riakiotakis
noreply at git.blender.org
Wed Feb 12 17:00:59 CET 2014
Commit: 09e5373c0647db6144ceaf3f730a4c67c76dfc42
Author: Antony Riakiotakis
Date: Wed Feb 12 17:57:25 2014 +0200
https://developer.blender.org/rB09e5373c0647db6144ceaf3f730a4c67c76dfc42
Paint: Descrollification commit for brush texture angle property.
Original patch by Sebastian Koenig with edits.
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index e27d80b..462ca2e 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -90,23 +90,24 @@ def brush_texture_settings(layout, brush, sculpt):
layout.operator("brush.stencil_reset_transform")
# angle and texture_angle_source
- col = layout.column()
- col.active = brush.brush_capabilities.has_texture_angle_source
- col.label(text="Angle:")
- if brush.brush_capabilities.has_random_texture_angle:
- if sculpt:
- if brush.sculpt_capabilities.has_random_texture_angle:
- col.prop(brush, "texture_angle_source_random", text="")
+ 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:
+ 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="")
+
+ else:
+ row.prop(brush, "texture_angle_source_random", text="")
else:
- col.prop(brush, "texture_angle_source_no_random", text="")
+ row.prop(brush, "texture_angle_source_no_random", text="")
- else:
- col.prop(brush, "texture_angle_source_random", text="")
- else:
- col.prop(brush, "texture_angle_source_no_random", text="")
- col = layout.column()
- col.active = brush.brush_capabilities.has_texture_angle
- col.prop(tex_slot, "angle", text="")
+ row.prop(tex_slot, "angle", text="")
# scale and offset
split = layout.split()
More information about the Bf-blender-cvs
mailing list