diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-01 20:01:29 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-01 20:01:29 +0400 |
commit | 18fd4d3137db8756c85d4cc8593e52aac2939970 (patch) | |
tree | c2bf2436337ee51460edd1eb06a05d15c0e6d85c /source | |
parent | 3ddbb36fa7233acaeefadadaf03fe4e0fff9e568 (diff) |
Partial fix for #26673: sss + normal map wasn't compatible with previous versions.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/render/intern/source/occlusion.c | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/rendercore.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index 8f070421890..0aa65479a4f 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -194,6 +194,7 @@ static void occ_shade(ShadeSample *ssamp, ObjectInstanceRen *obi, VlakRen *vlr, if(shi->obr->ob && shi->obr->ob->transflag & OB_NEG_SCALE) { negate_v3(shi->vn); negate_v3(shi->vno); + negate_v3(shi->nmapnorm); } /* init material vars */ diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index b30e4241c06..6d19846d80a 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1543,6 +1543,7 @@ static void shade_sample_sss(ShadeSample *ssamp, Material *mat, ObjectInstanceRe if(shi->obr->ob && shi->obr->ob->transflag & OB_NEG_SCALE) { negate_v3(shi->vn); negate_v3(shi->vno); + negate_v3(shi->nmapnorm); } /* if nodetree, use the material that we are currently preprocessing |