From 7f7f35d1ca75885eec6c062f9af00e4d0f39dbd0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 24 Sep 2006 09:21:18 +0000 Subject: [PATCH] fixed mistakes and warnings in previous commit. --- source/blender/python/api2_2x/Group.c | 2 +- source/blender/python/api2_2x/Metaball.c | 2 +- source/blender/python/api2_2x/Scene.c | 2 +- source/blender/python/api2_2x/Scene.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/blender/python/api2_2x/Group.c b/source/blender/python/api2_2x/Group.c index 080520e3a9d..805381e1912 100755 --- a/source/blender/python/api2_2x/Group.c +++ b/source/blender/python/api2_2x/Group.c @@ -707,7 +707,7 @@ static PyObject *GroupObSeq_getIter( BPy_GroupObSeq * self ) self->iter = self->bpygroup->group->gobject.first; return EXPP_incr_ret ( (PyObject *) self ); } else { - return GroupObSeq_CreatePyObject(self->bpygroup->group, self->bpygroup->group->gobject.first); + return GroupObSeq_CreatePyObject(self->bpygroup, self->bpygroup->group->gobject.first); } } diff --git a/source/blender/python/api2_2x/Metaball.c b/source/blender/python/api2_2x/Metaball.c index 0b107766da3..d8eae80aa7a 100644 --- a/source/blender/python/api2_2x/Metaball.c +++ b/source/blender/python/api2_2x/Metaball.c @@ -727,7 +727,7 @@ static PyObject *Metaball_copy( BPy_Metaball * self ) } -static PyObject *MetaElemSeq_CreatePyObject(PyObject *self, MetaElem *iter) +static PyObject *MetaElemSeq_CreatePyObject(BPy_Metaball *self, MetaElem *iter) { BPy_MetaElemSeq *seq = PyObject_NEW( BPy_MetaElemSeq, &MetaElemSeq_Type); seq->bpymetaball = self; Py_INCREF(self); diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c index e62fd12abc6..ae3ec459c5d 100644 --- a/source/blender/python/api2_2x/Scene.c +++ b/source/blender/python/api2_2x/Scene.c @@ -1123,7 +1123,7 @@ static PyObject *SceneObSeq_CreatePyObject( BPy_Scene *self, Base *iter, int mod static int SceneObSeq_len( BPy_SceneObSeq * self ) { Scene *scene= self->bpyscene->scene; - SCENE_DEL_CHECK_PY(self->bpyscene); + SCENE_DEL_CHECK_INT(self->bpyscene); if (self->mode == 0) /* all obejcts */ return BLI_countlist( &( scene->base ) ); diff --git a/source/blender/python/api2_2x/Scene.h b/source/blender/python/api2_2x/Scene.h index bdf0977b075..ee4c4573983 100644 --- a/source/blender/python/api2_2x/Scene.h +++ b/source/blender/python/api2_2x/Scene.h @@ -43,13 +43,13 @@ extern PyTypeObject SceneObSeq_Type; #define BPy_Scene_Check(v) \ ((v)->ob_type == &Scene_Type) -//---------------------------Python BPy_Scene structure definition---------- +/*---------------------------Python BPy_Scene structure definition----------*/ typedef struct { PyObject_HEAD Scene * scene; } BPy_Scene; -//---------------------------Python BPy_Scene visible prototypes----------- -// Python Scene_Type helper functions needed by Blender (the Init function) and Object modules. +/*---------------------------Python BPy_Scene visible prototypes-----------*/ +/* Python Scene_Type helper functions needed by Blender (the Init function) and Object modules. */ /* Scene object sequence, iterate on the scene object listbase*/