diff options
author | Janne Karhu <jhkarh@gmail.com> | 2011-02-08 17:29:48 +0300 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-08 17:29:48 +0300 |
commit | 811a1b910ca8f699ce499645ab99552fc2c83937 (patch) | |
tree | 9086296cbb58a943b9a95b6ed9f4aef9ecfe5194 /release | |
parent | 9e73ac2b9f6ba34c95e7146f346009363eb46a4d (diff) |
Texture context selector for texture panel:
* Texture context was previously determined by going to the appropriate panel, for example "world panel -> texture panel" to access world textures. Additionally there was a separate button to access brush textures.
* Now the texture context can be selected directly through an expanded icon menu, which shows the available context options.
* This context selector is now at the top of the texture panel, but this could later be perhaps integrated to the context path somehow to be more intuitive.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/ui/properties_texture.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index bd9f1a3b13f..9549eb28c63 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -99,6 +99,9 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel): if not isinstance(pin_id, bpy.types.Material): pin_id = None + if not space.use_pin_id: + layout.prop(space, "texture_context", expand=True) + tex_collection = (pin_id is None) and (node is None) and (not isinstance(idblock, bpy.types.Brush)) if tex_collection: @@ -126,9 +129,6 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel): col = split.column() - if not space.pin_id: - col.prop(space, "show_brush_texture", text="Brush", toggle=True) - if tex: split = layout.split(percentage=0.2) |