diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-05-29 14:44:52 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-05-29 14:44:52 +0400 |
| commit | c7b19d50661d8bb0ad5af1600e9eb8e5b3982917 (patch) | |
| tree | 766017f2a39eefd89f10a3c5335175122565632d | |
| parent | 0bd69e6616f59b8a4b02ba2ced46c24793b14be3 (diff) | |
Bug fix #2640
Somehow displacement got negated in my commit of april 12. Regression file
showed it, thanks efbie for finding it! :)
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 78cb65b5ff0..7f02260bfd7 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1724,10 +1724,10 @@ void do_material_tex(ShadeInput *shi) } if(mtex->maptoneg & MAP_DISPLACE) { - factt= (texres.tin-0.5)*mtex->dispfac; facmm= 1.0-factt; + factt= (0.5-texres.tin)*mtex->dispfac; facmm= 1.0-factt; } else { - factt= (0.5-texres.tin)*mtex->dispfac; facmm= 1.0-factt; + factt= (texres.tin-0.5)*mtex->dispfac; facmm= 1.0-factt; } if(mtex->blendtype==MTEX_BLEND) { |