diff options
author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-04-23 10:02:06 +0400 |
---|---|---|
committer | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-04-23 10:03:34 +0400 |
commit | fc28732ba65a57bccd47940249999809c2c93eb0 (patch) | |
tree | 1ba4dbb7e6644adc029ae36f00e5ac86d27e4b1f /source/blender/render/intern/raytrace | |
parent | 0e6b28e04b291dfe797432532208065c52ff3fdb (diff) |
Blender Internal: Add material property "Cast" which can disable both ray and buffer shadows.
Also refactor:
- Material property UI related to shadows
- Preparation of OR-ed mode flags (ma->mode_l) of render materials
Reviewers: brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D313
Diffstat (limited to 'source/blender/render/intern/raytrace')
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index 1ef44bbdd17..de6b9139363 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -119,7 +119,7 @@ MALWAYS_INLINE int vlr_check_intersect(Isect *is, ObjectInstanceRen *obi, VlakRe if (is->mode == RE_RAY_MIRROR) return !(vlr->mat->mode & MA_ONLYCAST); else - return (is->lay & obi->lay); + return (vlr->mat->mode2 & MA_CASTSHADOW) && (is->lay & obi->lay); } MALWAYS_INLINE int vlr_check_intersect_solid(Isect *UNUSED(is), ObjectInstanceRen *UNUSED(obi), VlakRen *vlr) |