diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-03-02 08:47:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-03-02 08:47:14 +0300 |
commit | 335f3424caaaee4a2e7b916ce2375ed7c4bb68d9 (patch) | |
tree | 31f3db7e75bd779d8dbc7a983a13aaeb3b4699cd /source/blender/python/api2_2x/Main.c | |
parent | 585edac6d2ef35f9199940e9d45aaef412860e45 (diff) |
made libdata iterator types use existing function from BPY_interface - ID_asPyObject(*id)
Diffstat (limited to 'source/blender/python/api2_2x/Main.c')
-rw-r--r-- | source/blender/python/api2_2x/Main.c | 69 |
1 files changed, 3 insertions, 66 deletions
diff --git a/source/blender/python/api2_2x/Main.c b/source/blender/python/api2_2x/Main.c index 6fceec1f485..23af017c164 100644 --- a/source/blender/python/api2_2x/Main.c +++ b/source/blender/python/api2_2x/Main.c @@ -67,7 +67,7 @@ #include "BIF_drawtext.h" /* unlink_text */ /* python types */ -#include "../BPY_extern.h" /* clearing scriptlinks */ +#include "../BPY_extern.h" /* clearing scriptlinks and ID_asPyObject */ #include "gen_utils.h" @@ -101,69 +101,6 @@ static PyObject *MainSeq_CreatePyObject( Link *iter, int type ) return (PyObject *)seq; } -static PyObject *Link_as_BPyData( Link *link, short type ) -{ - switch (type) { - case ID_SCE: - return Scene_CreatePyObject( ( Scene *) link ); - break; - case ID_OB: - return Object_CreatePyObject( (Object *) link ); - break; - case ID_ME: - return Mesh_CreatePyObject( (Mesh *)link, NULL ); - break; - case ID_CU: /*todo, support curnurbs?*/ - return Curve_CreatePyObject((Curve *)link); - break; - case ID_MB: - return Metaball_CreatePyObject((MetaBall *)link); - break; - case ID_MA: - return Material_CreatePyObject((Material *)link); - break; - case ID_TE: - return Texture_CreatePyObject((Tex *)link); - break; - case ID_IM: - return Image_CreatePyObject((Image *)link); - break; - case ID_LT: - return Lattice_CreatePyObject((Lattice *)link); - break; - case ID_LA: - return Lamp_CreatePyObject((Lamp *)link); - break; - case ID_CA: - return Camera_CreatePyObject((Camera *)link); - break; - case ID_IP: - return Ipo_CreatePyObject((Ipo *)link); - break; - case ID_WO: - return World_CreatePyObject((World *)link); - break; - case ID_VF: - return Font_CreatePyObject((VFont *)link); - break; - case ID_TXT: - return Text_CreatePyObject((Text *)link); - break; - case ID_SO: - return Sound_CreatePyObject((bSound *)link); - break; - case ID_GR: - return Group_CreatePyObject((Group *)link); - break; - case ID_AR: - return Armature_CreatePyObject((bArmature *)link); - break; - case ID_AC: - return Action_CreatePyObject((bAction *)link); - break; - } - Py_RETURN_NONE; -} static int MainSeq_len( BPy_MainSeq * self ) { @@ -221,7 +158,7 @@ static PyObject * MainSeq_subscript(BPy_MainSeq * self, PyObject *key) (lib && use_lib && id->lib && (!strcmp( id->lib->name, lib))) /* only external lib */ ) { - return Link_as_BPyData((Link *)id, self->type); + return ID_asPyObject(id); } } } @@ -280,7 +217,7 @@ static PyObject *MainSeq_nextIter( BPy_MainSeq * self ) "iterator at end" ); } - object = Link_as_BPyData(self->iter, self->type); + object = ID_asPyObject((ID *)self->iter); link= self->iter->next; self->iter= link; |