Revision: 17149 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17149 Author: blendix Date: 2008-10-21 16:46:00 +0200 (Tue, 21 Oct 2008)
Log Message: ----------- Fix for bug #17881: with SSS disabled, SSS materials didn't render textures, related to other recent bugfix for baking. Modified Paths: -------------- trunk/blender/source/blender/render/intern/source/sss.c Modified: trunk/blender/source/blender/render/intern/source/sss.c =================================================================== --- trunk/blender/source/blender/render/intern/source/sss.c 2008-10-21 10:38:24 UTC (rev 17148) +++ trunk/blender/source/blender/render/intern/source/sss.c 2008-10-21 14:46:00 UTC (rev 17149) @@ -1025,6 +1025,6 @@ int sss_pass_done(struct Render *re, struct Material *mat) { - return ((re->flag & R_BAKING) || (re->sss_hash && BLI_ghash_lookup(re->sss_hash, mat))); + return ((re->flag & R_BAKING) || !(re->r.mode & R_SSS) || (re->sss_hash && BLI_ghash_lookup(re->sss_hash, mat))); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs