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:
authorIRIE Shinsuke <irieshinsuke@yahoo.co.jp>2014-05-22 20:41:27 +0400
committerIRIE Shinsuke <irieshinsuke@yahoo.co.jp>2014-05-22 20:49:58 +0400
commit12e47d053646d0314d822a96c6d29cbefaf2a277 (patch)
tree420f5a47fdd9453b5e3ff8cfa0129cb038a35059 /release
parent97d047a3e9a52d9e2d8c0eee6932ab9ab9199ab9 (diff)
Blender Internal: Fix texture influence panel not showing Displace/Warp sliders for volume materials.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 9aa137ca9ea..ec91be74a36 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -1090,6 +1090,8 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
factor_but(col, "use_map_translucency", "translucency_factor", "Add")
elif idblock.type == 'VOLUME':
+ layout.label(text="Volume:")
+
split = layout.split()
col = split.column()
@@ -1104,6 +1106,16 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
factor_but(col, "use_map_color_transmission", "transmission_color_factor", "Transmission Color")
factor_but(col, "use_map_color_reflection", "reflection_color_factor", "Reflection Color")
+ layout.label(text="Geometry:")
+
+ split = layout.split()
+
+ col = split.column()
+ factor_but(col, "use_map_warp", "warp_factor", "Warp")
+
+ col = split.column()
+ factor_but(col, "use_map_displacement", "displacement_factor", "Displace")
+
elif isinstance(idblock, Lamp):
split = layout.split()