Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2009-08-14 00:05:36 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2009-08-14 00:05:36 +0400
commit972224b9e1934002f0c2ace326facd706c1e0b32 (patch)
tree436f31e0b82c271047eeeef9faca7b4161832dcf /release
parent75af1a7f9eba4c761fea08995c5d529ed602a19a (diff)
2.5/Sculpt:
* Moved the brush texture settings to MTex/TextureSlot. The mapping settings now show up in the texture panel, pretty much like they do for textures used with materials. TODO: * Tiled mode should not show Z size setting * Add a locked mode so that texture size can be changed uniformly like in 2.4x
Diffstat (limited to 'release')
-rw-r--r--release/ui/buttons_texture.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index f3d5d96cc28..a1c2e348f2e 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -137,9 +137,20 @@ class TEXTURE_PT_mapping(TextureButtonsPanel):
row.itemR(tex, "y_mapping", text="")
row.itemR(tex, "z_mapping", text="")
- row = layout.row()
- row.column().itemR(tex, "offset")
- row.column().itemR(tex, "size")
+ if br:
+ layout.itemR(tex, "brush_map_mode", expand=True)
+
+ row = layout.row()
+ row.active = tex.brush_map_mode in ('FIXED', 'TILED')
+ row.itemR(tex, "angle")
+
+ row = layout.row()
+ row.active = tex.brush_map_mode in ('TILED', '3D')
+ row.column().itemR(tex, "size")
+ else:
+ row = layout.row()
+ row.column().itemR(tex, "offset")
+ row.column().itemR(tex, "size")
class TEXTURE_PT_influence(TextureButtonsPanel):
__label__ = "Influence"