diff options
| author | Matt Ebb <matt@mke3.net> | 2010-05-18 07:10:47 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-05-18 07:10:47 +0400 |
| commit | 10f5be4fbf3556b22f56faf96df09be2d39449e4 (patch) | |
| tree | 2b045e3c93311eab30ecadf21c9038ff00e4d4d1 /release | |
| parent | 45444ceee308bdbc40078975b48e4ce743253d24 (diff) | |
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.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 976c3be667f..39c6bdf1d9f 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -374,7 +374,8 @@ class TEXTURE_PT_influence(TextureSlotPanel): 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") |