blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

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
This commit is contained in:
Porteries Tristan 2015-04-17 18:10:34 +02:00 committed by Thomas Szepe
parent 394c5318c6
commit e0aeafdf0a
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/gameengine/Ketsji/KX_Light.cpp
View File

@ -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;
self->m_lightobj->m_layer = val;
return PY_SET_ATTR_SUCCESS;
if (layer == -1 && PyErr_Occurred()) {
PyErr_Format(PyExc_TypeError, "expected an integer for attribute \"%s\"", 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;
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;
}
self->SetLayer(layer);
return PY_SET_ATTR_SUCCESS;
}
PyObject *KX_LightObject::pyattr_get_energy(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)

2
source/gameengine/Ketsji/KX_Light.h
View File

@ -34,6 +34,8 @@
#include "KX_GameObject.h"
#define MAX_LIGHT_LAYERS ((1 << 20) - 1)
struct GPULamp;
struct Scene;
struct Base;