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:
authorThomas Dinges <blender@dingto.org>2014-05-06 17:01:24 +0400
committerThomas Dinges <blender@dingto.org>2014-05-06 17:02:46 +0400
commite393dde435ab2f944cff03e6312cae437800184f (patch)
tree68e5a246bd329886228c21c2b8fbedae8484491b /release
parent45b4506c0dc6e1acdd40e03be3e4fe50128ed928 (diff)
Modifier UI: More space for Displace modifier texture ID.
Was really cluttered sometimes: http://www.pasteall.org/pic/70876 Reshuffled layout a bit to avoid this now.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py31
1 files changed, 15 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 8e3e289ea3b..60187ff1cd5 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -283,29 +283,28 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
def DISPLACE(self, layout, ob, md):
has_texture = (md.texture is not None)
- split = layout.split()
-
- col = split.column()
+ col = layout.column(align=True)
col.label(text="Texture:")
col.template_ID(md, "texture", new="texture.new")
- col.label(text="Vertex Group:")
- col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
- col = split.column()
+ split = layout.split()
+
+ col = split.column(align=True)
col.label(text="Direction:")
col.prop(md, "direction", text="")
- colsub = col.column()
- colsub.active = has_texture
- colsub.label(text="Texture Coordinates:")
- colsub.prop(md, "texture_coords", text="")
+ col.label(text="Vertex Group:")
+ col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
+
+ col = split.column(align=True)
+ col.active = has_texture
+ col.label(text="Texture Coordinates:")
+ col.prop(md, "texture_coords", text="")
if md.texture_coords == 'OBJECT':
- row = layout.row()
- row.active = has_texture
- row.prop(md, "texture_coords_object", text="Object")
+ col.label(text="Object:")
+ col.prop(md, "texture_coords_object", text="")
elif md.texture_coords == 'UV' and ob.type == 'MESH':
- row = layout.row()
- row.active = has_texture
- row.prop_search(md, "uv_layer", ob.data, "uv_textures")
+ col.label(text="UV Map:")
+ col.prop_search(md, "uv_layer", ob.data, "uv_textures", text="")
layout.separator()