diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-31 00:59:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-31 00:59:20 +0300 |
| commit | 1943a73439f04f65d721c8e58270d29498ff6b96 (patch) | |
| tree | 1eccd79f2755fe7bd8ac7679a6ff80811a641955 /source/gameengine | |
| parent | 25eb46810f288c77126b3f5c3b2a970936bf199a (diff) | |
rename game object obcolor to color
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/PyDoc/GameTypes.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 1b9c82b432c..ba1bb7c5d7c 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1487,7 +1487,7 @@ PyAttributeDef KX_GameObject::Attributes[] = { KX_PYATTRIBUTE_RO_FUNCTION("children", KX_GameObject, pyattr_get_children), KX_PYATTRIBUTE_RO_FUNCTION("childrenRecursive", KX_GameObject, pyattr_get_children_recursive), KX_PYATTRIBUTE_RO_FUNCTION("attrDict", KX_GameObject, pyattr_get_attrDict), - KX_PYATTRIBUTE_RW_FUNCTION("obcolor", KX_GameObject, pyattr_get_obcolor, pyattr_set_obcolor), + KX_PYATTRIBUTE_RW_FUNCTION("color", KX_GameObject, pyattr_get_obcolor, pyattr_set_obcolor), /* Experemental, dont rely on these yet */ KX_PYATTRIBUTE_RO_FUNCTION("sensors", KX_GameObject, pyattr_get_sensors), diff --git a/source/gameengine/PyDoc/GameTypes.py b/source/gameengine/PyDoc/GameTypes.py index 390fb357761..61b95e70c0b 100644 --- a/source/gameengine/PyDoc/GameTypes.py +++ b/source/gameengine/PyDoc/GameTypes.py @@ -1529,6 +1529,8 @@ class KX_GameObject(SCA_IObject): @ivar visible: visibility flag. - note: Game logic will still run for invisible objects. @type visible: boolean + @ivar color: The object color of the object + @type color: list [r, g, b, a] @ivar occlusion: occlusion capability flag. @type occlusion: boolean @ivar position: The object's position. |