[Bf-blender-cvs] [6e17420] master: BGE: Fix for T43788 Light casts shadow when use_shadow unchecked
Jorge Bernal
noreply at git.blender.org
Fri Mar 13 23:46:43 CET 2015
Commit: 6e174205488b28381fdb5e8dbcff2a0a61b5ea6c
Author: Jorge Bernal
Date: Fri Mar 13 23:46:07 2015 +0100
Branches: master
https://developer.blender.org/rB6e174205488b28381fdb5e8dbcff2a0a61b5ea6c
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
===================================================================
M source/blender/makesrna/intern/rna_lamp.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index 81c26af..d4084bd 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)
More information about the Bf-blender-cvs
mailing list