Revision: 35943
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35943
Author: blendix
Date: 2011-04-01 16:01:29 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Partial fix for #26673: sss + normal map wasn't compatible with previous
versions.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/rendercore.c
Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c
2011-04-01 15:13:58 UTC (rev 35942)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c
2011-04-01 16:01:29 UTC (rev 35943)
@@ -194,6 +194,7 @@
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 */
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c
2011-04-01 15:13:58 UTC (rev 35942)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c
2011-04-01 16:01:29 UTC (rev 35943)
@@ -1543,6 +1543,7 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
