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:
authorTon Roosendaal <ton@blender.org>2011-03-24 21:39:54 +0300
committerTon Roosendaal <ton@blender.org>2011-03-24 21:39:54 +0300
commit22ea604c6f877f36747b9e07b0459ee20cf6b0e5 (patch)
tree3c6bd882987c5461399cff13ceb23e8e646d7d4c /release/scripts
parentdee8ba8ba18766b15d427c0daa8e50097d3c26e9 (diff)
Bugfix 26578
"Warp" texture map option didnt work for new bump methods yet. Also fixed to not grey out bump menu for this mapping option.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 7e289f1ecce..f6fa86d64aa 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -1015,7 +1015,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
# only show bump settings if activated but not for normalmap images
row = layout.row()
- row.active = tex.use_map_normal and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map)
+ row.active = (tex.use_map_normal or tex.use_map_warp) and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map)
row.prop(tex, "bump_method", text="Method")