archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix #2640

Browse Source 
Somehow displacement got negated in my commit of april 12. Regression file
showed it, thanks efbie for finding it! :)
This commit is contained in:
Ton Roosendaal
2005-05-29 10:44:52 +00:00
parent 0bd69e6616
commit c7b19d5066
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/texture.c
View File

@@ -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) {