[Bf-blender-cvs] [e0aeafd] master: BGE : Fix light layer check

[Porteries Tristan]

Commit: e0aeafdf0a22c18bf4970d7f9a34326bcebe491b
Author: Porteries Tristan
Date:   Fri Apr 17 18:10:34 2015 +0200
Branches: master
https://developer.blender.org/rBe0aeafdf0a22c18bf4970d7f9a34326bcebe491b

BGE : Fix light layer check

The layers in Blender are using a bit field for the 20 layers. The light layer value was limited to 20, so the highest usable light layer was five.
The patch modify the range and add layer out of range error messages.

Reviewers: sybren, hg1, moguri

Reviewed By: hg1, moguri

Projects: #game_engine

Differential Revision: https://developer.blender.org/D1238

===================================================================

M	source/gameengine/Ketsji/KX_Light.cpp
M	source/gameengine/Ketsji/KX_Light.h

===================================================================

diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 33cfec5..d6b84e9 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -166,27 +166,31 @@ PyAttributeDef KX_LightObject::Attributes[] = {
 
 PyObject *KX_LightObject::pyattr_get_layer(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_LightObject* self = static_cast<KX_LightObject*>(self_v);
+	KX_LightObject *self = static_cast<KX_LightObject *>(self_v);
 	return PyLong_FromLong(self->m_lightobj->m_layer);
 }
 
 int KX_LightObject::pyattr_set_layer(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
 {
-	KX_LightObject* self = static_cast<KX_LightObject*>(self_v);
+	KX_LightObject *self = static_cast<KX_LightObject *>(self_v);
+	int layer = PyLong_AsLong(value);
 
-	if (PyLong_Check(value)) {
-		int val = PyLong_AsLong(value);
-		if (val < 1)
-			val = 1;
-		else if (val > 20)
-			val = 20;
+	if (layer == -1 && PyErr_Occurred()) {
+		PyErr_Format(PyExc_TypeError, "expected an integer for attribute \"%s\"", attrdef->m_name);
+		return PY_SET_ATTR_FAIL;
+	}
 
-		self->m_lightobj->m_layer = val;
-		return PY_SET_ATTR_SUCCESS;
+	if (layer < 1) {
+		PyErr_Format(PyExc_TypeError, "expected an integer greater than 1 for attribute \"%s\"", attrdef->m_name);
+		return PY_SET_ATTR_FAIL;
+	}
+	else if(layer > MAX_LIGHT_LAYERS) {
+		PyErr_Format(PyExc_TypeError, "expected an integer less than %i for attribute \"%s\"", MAX_LIGHT_LAYERS, attrdef->m_name);
+		return PY_SET_ATTR_FAIL;
 	}
 
-	PyErr_Format(PyExc_TypeError, "expected an integer for attribute \"%s\"", attrdef->m_name);
-	return PY_SET_ATTR_FAIL;
+	self->SetLayer(layer);
+	return PY_SET_ATTR_SUCCESS;
 }
 
 PyObject *KX_LightObject::pyattr_get_energy(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 503ed74..386f8e9 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -34,6 +34,8 @@
 
 #include "KX_GameObject.h"
 
+#define MAX_LIGHT_LAYERS ((1 << 20) - 1)
+
 struct GPULamp;
 struct Scene;
 struct Base;