diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-03-14 01:46:07 +0300 |
---|---|---|
committer | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-03-14 01:47:15 +0300 |
commit | 6e174205488b28381fdb5e8dbcff2a0a61b5ea6c (patch) | |
tree | 56959b38b5b42fe450d14e2a1cec7d533c94f350 /source | |
parent | fc3de690ac0603b566998b8a68b3c38d7767c9b6 (diff) |
BGE: Fix for T43788 Light casts shadow when use_shadow unchecked
Makes use_shadow usage consistent across supported lamp types (Spot and
Sun)
Differential D1148
Reviewers: Moguri, Brecht
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 81c26af189d..d4084bdaf30 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -94,7 +94,7 @@ static int rna_use_shadow_get(PointerRNA *ptr) Lamp *la = (Lamp *)ptr->data; if (la->type == LA_SPOT) { - return (la->mode & LA_SHAD_BUF) != 0; + return (la->mode & (LA_SHAD_BUF|LA_SHAD_RAY)) != 0; } else { return (la->mode & LA_SHAD_RAY) != 0; @@ -104,14 +104,10 @@ static int rna_use_shadow_get(PointerRNA *ptr) static void rna_use_shadow_set(PointerRNA *ptr, int value) { Lamp *la = (Lamp *)ptr->data; + la->mode &= ~(LA_SHAD_BUF | LA_SHAD_RAY); if (value) { - if (la->type == LA_SPOT) - la->mode |= LA_SHAD_BUF; - else - la->mode |= LA_SHAD_RAY; + la->mode |= LA_SHAD_RAY; } - else - la->mode &= ~(LA_SHAD_BUF | LA_SHAD_RAY); } static StructRNA *rna_Lamp_refine(struct PointerRNA *ptr) |