diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-25 20:54:06 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-25 20:54:06 +0400 |
| commit | fa8c779c2d3b8c97511d5e27919e833388fe75c1 (patch) | |
| tree | 10538739b58ad8567a3f2a528523eb7706467b6f | |
| parent | dd064b5990c7b84befcf156c6d38c08d183065c4 (diff) | |
Displacement didn't react correct for stencilling. Our confusing system
has both geometry-normal displace as texture-normal displace. The first
didn't get stencilled.
| -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 3f28255872d..46001855b2a 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1793,10 +1793,10 @@ void do_material_tex(ShadeInput *shi) } if(mtex->maptoneg & MAP_DISPLACE) { - factt= (texres.tin-0.5f)*mtex->dispfac; facmm= 1.0f-factt; + factt= (texres.tin-0.5f)*mtex->dispfac*stencilTin; facmm= 1.0f-factt; } else { - factt= (0.5f-texres.tin)*mtex->dispfac; facmm= 1.0f-factt; + factt= (0.5f-texres.tin)*mtex->dispfac*stencilTin; facmm= 1.0f-factt; } if(mtex->blendtype==MTEX_BLEND) { |