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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-10-20 18:58:53 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-10-20 18:58:53 +0400
commitf21043f32e2726ff0ee08b19aa8b634eeef7cf3e (patch)
tree1fde9b3eecc15f0682b4d4310b953ee3843f589a /release
parent4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff)
UI tweak: user texture datablock chooser for fields and warp modifier,
more consistent with other places.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_field.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 62261af729f..e4b152834fc 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -665,7 +665,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
split = layout.split()
col = split.column()
col.label(text="Texture:")
- col.prop(md, "texture", text="")
+ col.template_ID(md, "texture", new="texture.new")
col = split.column()
col.label(text="Texture Coordinates:")
diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index f0755962580..2229b9dc3da 100644
--- a/release/scripts/startup/bl_ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -61,6 +61,10 @@ class PHYSICS_PT_field(PhysicButtonsPanel, Panel):
split = layout.split(percentage=0.2)
split.label(text="Shape:")
split.prop(field, "shape", text="")
+ elif field.type == 'TEXTURE':
+ split = layout.split(percentage=0.2)
+ split.label(text="Texture:")
+ split.row().template_ID(field, "texture", new="texture.new")
split = layout.split()
@@ -103,7 +107,6 @@ class PHYSICS_PT_field(PhysicButtonsPanel, Panel):
elif field.type == 'TEXTURE':
col = split.column()
col.prop(field, "strength")
- col.prop(field, "texture", text="")
col.prop(field, "texture_mode", text="")
col.prop(field, "texture_nabla")