diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-10-21 18:46:00 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-10-21 18:46:00 +0400 |
| commit | 7a4e9d97fff0a795a3ab076702d8b856b2e5bf62 (patch) | |
| tree | 2e486a99a8c768edaf9a2267db44e14321737379 /source/blender/render | |
| parent | b32bd5e8afea11615b58028901400fa1862e9f8f (diff) | |
Fix for bug #17881: with SSS disabled, SSS materials didn't
render textures, related to other recent bugfix for baking.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/sss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index 2e7ca48affc..9fb48a08503 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -1025,6 +1025,6 @@ int sample_sss(Render *re, Material *mat, float *co, float *color) 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))); } |