diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-11-11 13:14:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-11-11 13:14:27 +0300 |
| commit | bdec277cc69318125114047690e071bcd7db2868 (patch) | |
| tree | 61c4d232cad4226741d9682e6e896a7fd3510ced /source/blender/render | |
| parent | 8c98fbb0a966db05216ce4b3c5bfb9607150110f (diff) | |
This is the famous proverbal example of someone trying to get a 4 legged
table stable... you keep correcting leg sizes until no table is left
anymore! :)
This commit restores the displacement direction from 2.37a code, which was
negated 5 months ago to fix a change in renderconverter.c, but somehow is
not needed anymore. The regression displacement file now renders OK again.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 19f7d5f9fb9..273d20a87c1 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1736,14 +1736,14 @@ void do_material_tex(ShadeInput *shi) if(rgbnor & TEX_RGB) { if(texres.talpha) texres.tin= texres.ta; - else texres.tin= (0.35*texres.tr+0.45*texres.tg+0.2*texres.tb); + else texres.tin= (0.35f*texres.tr+0.45f*texres.tg+0.2f*texres.tb); } if(mtex->maptoneg & MAP_DISPLACE) { - factt= (0.5-texres.tin)*mtex->dispfac; facmm= 1.0-factt; + factt= (texres.tin-0.5f)*mtex->dispfac; facmm= 1.0f-factt; } else { - factt= (texres.tin-0.5)*mtex->dispfac; facmm= 1.0-factt; + factt= (0.5f-texres.tin)*mtex->dispfac; facmm= 1.0f-factt; } if(mtex->blendtype==MTEX_BLEND) { |