[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28812] trunk/blender/release/scripts/ui/ properties_texture.py: Fix [#22345] ReleaseRenderOpt 2. 5 Problem with rendering displacement map

[Matt Ebb]

Revision: 28812
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28812
Author:   broken
Date:     2010-05-18 05:10:47 +0200 (Tue, 18 May 2010)

Log Message:
-----------
Fix [#22345]  ReleaseRenderOpt 2.5 Problem with rendering displacement map

Communicate the existing material displacement feature's strange dependence on both
'normal' and 'displacement' influences better. This will do until the improved displacement
is merged from render branch.	

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-05-17 20:38:54 UTC (rev 28811)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-05-18 03:10:47 UTC (rev 28812)
@@ -374,7 +374,8 @@
                 factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror")
 
                 col.label(text="Geometry:")
-                factor_but(col, tex.map_normal, "map_normal", "normal_factor", "Normal")
+                # XXX replace 'or' when displacement is fixed to not rely on normal influence value.
+                factor_but(col, (tex.map_normal or tex.map_displacement), "map_normal", "normal_factor", "Normal")
                 factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp")
                 factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace")