diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-15 08:50:47 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-15 08:50:47 +0400 |
| commit | a8e9d5533f51455febc40d386c8c2ce0cc561b7a (patch) | |
| tree | 6c111b7755a52f0a043a7be285abc5752627f34b /release/scripts/startup/bl_ui/properties_texture.py | |
| parent | cb24a9505a42b286d3feb1638c8d190f09ad2cd7 (diff) | |
Code/UI cleanup: improvements for sculpt brush texture settings.
Settings are shown in both the View3D toolbar and texture properties
panel; code is now in shared sculpt_brush_texture_settings() function
in properties_paint_common.py.
Also added a few new properties to the SculptCapabilities RNA to
replace "X in {Y, Z}" tests in the Python code.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 32047581550..1d5e96cf701 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -29,6 +29,8 @@ from bpy.types import (Brush, from rna_prop_ui import PropertyPanel +from bl_ui.properties_paint_common import sculpt_brush_texture_settings + class TEXTURE_MT_specials(Menu): bl_label = "Texture Specials" @@ -856,12 +858,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): if isinstance(idblock, Brush): if context.sculpt_object: - layout.label(text="Brush Mapping:") - layout.prop(tex, "map_mode", expand=True) - - row = layout.row() - row.active = tex.map_mode in {'FIXED', 'TILED'} - row.prop(tex, "angle") + sculpt_brush_texture_settings(layout, idblock) else: if isinstance(idblock, Material): split = layout.split(percentage=0.3) @@ -884,9 +881,9 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): row.prop(tex, "mapping_y", text="") row.prop(tex, "mapping_z", text="") - row = layout.row() - row.column().prop(tex, "offset") - row.column().prop(tex, "scale") + row = layout.row() + row.column().prop(tex, "offset") + row.column().prop(tex, "scale") class TEXTURE_PT_influence(TextureSlotPanel, Panel): |