archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- getBones() fixed - returns all armature bones including children

Browse Source
This commit is contained in:
Joseph Gilbert
2004-04-05 04:17:01 +00:00
parent 09b19aead2
commit 136b66c19f
2 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/blender/python/api2_2x/Armature.c
View File

@@ -314,29 +314,37 @@ Armature_getName (BPy_Armature * self)
}
/** Create and return a list of the root bones for this armature. */
static void
append_childrenToList(Bone *parent, PyObject *listbones)
{
Bone *child = NULL;
//append children
for(child = parent->childbase.first; child; child = child->next){
PyList_Append (listbones, Bone_CreatePyObject (child));
if(child->childbase.first){ //has children?
append_childrenToList(child, listbones);
}
}
}
static PyObject *
Armature_getBones (BPy_Armature * self)
{
int totbones = 0;
PyObject *listbones = NULL;
Bone *current = NULL;
int i;
Bone *parent = NULL;
listbones = PyList_New(0);
/* Count the number of bones to create the list */
current = self->armature->bonebase.first;
for (; current; current = current->next)
totbones++;
/* Create a list with a bone wrapper for each bone */
current = self->armature->bonebase.first;
listbones = PyList_New (totbones);
for (i = 0; i < totbones; i++)
{
/* Wrap and set to corresponding element of the list. */
PyList_SetItem (listbones, i, Bone_CreatePyObject (current));
current = current->next;
}
//append root bones
for (parent = self->armature->bonebase.first; parent; parent = parent->next){
PyList_Append (listbones, Bone_CreatePyObject (parent));
if(parent->childbase.first){ //has children?
append_childrenToList(parent, listbones);
}
}
return listbones;
}
@@ -525,8 +533,6 @@ Armature_setAttr (BPy_Armature * self, char *name, PyObject * value)
if (strcmp (name, "name") == 0)
error = Armature_setName (self, valtuple);
/* if (strcmp (name, "bones") == 0)
error = Armature_setBones (self, valtuple); */
else
{ /* Error */
Py_DECREF (valtuple);

29
source/blender/python/api2_2x/Bone.c
View File

@@ -653,9 +653,9 @@ Bone_setParent(BPy_Bone *self, PyObject *args)
}
/*****************************************************************************/
/* Function: Bone_dealloc */
/* Function: Bone_dealloc */
/* Description: This is a callback function for the BPy_Bone type. It is */
/* the destructor function. */
/* the destructor function. */
/*****************************************************************************/
static void
Bone_dealloc (BPy_Bone * self)
@@ -665,7 +665,7 @@ Bone_dealloc (BPy_Bone * self)
}
/*****************************************************************************/
/* Function: Bone_getAttr */
/* Function: Bone_getAttr */
/* Description: This is a callback function for the BPy_Bone type. It is */
/* the function that accesses BPy_Bone member variables and */
/* methods. */
@@ -714,7 +714,7 @@ Bone_getAttr (BPy_Bone * self, char *name)
}
/*****************************************************************************/
/* Function: Bone_setAttr */
/* Function: Bone_setAttr */
/* Description: This is a callback function for the BPy_Bone type. It is the */
/* function that changes Bone Data members values. If this */
/* data is linked to a Blender Bone, it also gets updated. */
@@ -751,7 +751,7 @@ Bone_setAttr (BPy_Bone * self, char *name, PyObject * value)
}
/*****************************************************************************/
/* Function: Bone_repr */
/* Function: Bone_repr */
/* Description: This is a callback function for the BPy_Bone type. It */
/* builds a meaninful string to represent bone objects. */
/*****************************************************************************/
@@ -765,10 +765,10 @@ Bone_repr (BPy_Bone * self)
}
/**************************************************************************/
/* Function: Bone_compare */
/* Function: Bone_compare */
/* Description: This is a callback function for the BPy_Bone type. It */
/* compares the two bones: translate comparison to the */
/* C pointers. */
/* C pointers. */
/**************************************************************************/
static int
Bone_compare (BPy_Bone * a, BPy_Bone * b)
@@ -777,13 +777,10 @@ Bone_compare (BPy_Bone * a, BPy_Bone * b)
return (pa == pb) ? 0 : -1;
}
/*****************************************************************************/
/* Function: Bone_CreatePyObject */
/* Function: Bone_CreatePyObject */
/* Description: This function will create a new BlenBone from an existing */
/* Bone structure. */
/* Bone structure. */
/*****************************************************************************/
PyObject *
Bone_CreatePyObject (struct Bone * obj)
@@ -801,9 +798,9 @@ Bone_CreatePyObject (struct Bone * obj)
}
/*****************************************************************************/
/* Function: Bone_CheckPyObject */
/* Function: Bone_CheckPyObject */
/* Description: This function returns true when the given PyObject is of the */
/* type Bone. Otherwise it will return false. */
/* type Bone. Otherwise it will return false. */
/*****************************************************************************/
int
Bone_CheckPyObject (PyObject * py_obj)
@@ -812,9 +809,9 @@ Bone_CheckPyObject (PyObject * py_obj)
}
/*****************************************************************************/
/* Function: Bone_FromPyObject */
/* Function: Bone_FromPyObject */
/* Description: This function returns the Blender bone from the given */
/* PyObject. */
/* PyObject. */
/*****************************************************************************/
struct Bone *
Bone_FromPyObject (PyObject * py_obj)