[Bf-blender-cvs] [12e47d0] master: Blender Internal: Fix texture influence panel not showing Displace/Warp sliders for volume materials.

[IRIE Shinsuke]

Commit: 12e47d053646d0314d822a96c6d29cbefaf2a277
Author: IRIE Shinsuke
Date:   Fri May 23 01:41:27 2014 +0900
https://developer.blender.org/rB12e47d053646d0314d822a96c6d29cbefaf2a277

Blender Internal: Fix texture influence panel not showing Displace/Warp sliders for volume materials.

===================================================================

M	release/scripts/startup/bl_ui/properties_texture.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 9aa137c..ec91be7 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()