[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51204] trunk/blender: rename BGE KX_GameObject attrs
Campbell Barton
ideasman42 at gmail.com
Tue Oct 9 08:03:59 CEST 2012
Revision: 51204
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51204
Author: campbellbarton
Date: 2012-10-09 06:03:57 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
rename BGE KX_GameObject attrs
* group -> group_parent
* members -> group_children
so its more clear what direction the relationship is.
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/bge.types.rst
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
Modified: trunk/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.types.rst 2012-10-09 05:58:09 UTC (rev 51203)
+++ trunk/blender/doc/python_api/rst/bge.types.rst 2012-10-09 06:03:57 UTC (rev 51204)
@@ -989,13 +989,13 @@
:type: :class:`KX_GameObject` or None
- .. attribute:: members
+ .. attribute:: group_children
Returns the list of group members if the object is a group object, otherwise None is returned.
:type: :class:`CListValue` of :class:`KX_GameObject` or None
- .. attribute:: group
+ .. attribute:: group_parent
Returns the group object that the object belongs to or None if the object is not part of a group.
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2012-10-09 05:58:09 UTC (rev 51203)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2012-10-09 06:03:57 UTC (rev 51204)
@@ -1681,8 +1681,8 @@
PyAttributeDef KX_GameObject::Attributes[] = {
KX_PYATTRIBUTE_RO_FUNCTION("name", KX_GameObject, pyattr_get_name),
KX_PYATTRIBUTE_RO_FUNCTION("parent", KX_GameObject, pyattr_get_parent),
- KX_PYATTRIBUTE_RO_FUNCTION("members", KX_GameObject, pyattr_get_instance_objects),
- KX_PYATTRIBUTE_RO_FUNCTION("group", KX_GameObject, pyattr_get_dupli_group_object),
+ KX_PYATTRIBUTE_RO_FUNCTION("group_children", KX_GameObject, pyattr_get_group_children),
+ KX_PYATTRIBUTE_RO_FUNCTION("group_parent", KX_GameObject, pyattr_get_group_parent),
KX_PYATTRIBUTE_RO_FUNCTION("scene", KX_GameObject, pyattr_get_scene),
KX_PYATTRIBUTE_RO_FUNCTION("life", KX_GameObject, pyattr_get_life),
KX_PYATTRIBUTE_RW_FUNCTION("mass", KX_GameObject, pyattr_get_mass, pyattr_set_mass),
@@ -1979,7 +1979,7 @@
Py_RETURN_NONE;
}
-PyObject *KX_GameObject::pyattr_get_instance_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_GameObject::pyattr_get_group_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
{
KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
CListValue* instances = self->GetInstanceObjects();
@@ -2000,7 +2000,7 @@
Py_RETURN_NONE;
}
-PyObject *KX_GameObject::pyattr_get_dupli_group_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_GameObject::pyattr_get_group_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
{
KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
KX_GameObject* pivot = self->GetDupliGroupObject();
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2012-10-09 05:58:09 UTC (rev 51203)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2012-10-09 06:03:57 UTC (rev 51204)
@@ -978,8 +978,8 @@
static PyObject* pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static PyObject* pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
- static PyObject* pyattr_get_dupli_group_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
- static PyObject* pyattr_get_instance_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static PyObject* pyattr_get_group_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static PyObject* pyattr_get_group_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static PyObject* pyattr_get_scene(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static PyObject* pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
More information about the Bf-blender-cvs
mailing list