diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-03-15 04:09:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-03-15 04:09:14 +0300 |
commit | ee5dc4d0bf99fe457ece7b37df72dc1cc12e3cd1 (patch) | |
tree | c42b47cc23156ca0e8a03610faf175f9535a5b5d /source/blender/python/api2_2x/Scene.c | |
parent | a567e43628e780b5cc88f0f1aa73eb3111eab0f5 (diff) |
removed duplicate functionality, macro's and functions existed to check a PyObjects type, now only use macro's
Diffstat (limited to 'source/blender/python/api2_2x/Scene.c')
-rw-r--r-- | source/blender/python/api2_2x/Scene.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c index 89efe42ef28..96ca435cdc9 100644 --- a/source/blender/python/api2_2x/Scene.c +++ b/source/blender/python/api2_2x/Scene.c @@ -592,12 +592,6 @@ PyObject *Scene_CreatePyObject( Scene * scene ) return ( PyObject * ) pyscene; } -/*-----------------------CheckPyObject----------------------------------*/ -int Scene_CheckPyObject( PyObject * pyobj ) -{ - return ( pyobj->ob_type == &Scene_Type ); -} - /*-----------------------FromPyObject-----------------------------------*/ Scene *Scene_FromPyObject( PyObject * pyobj ) { @@ -1459,33 +1453,33 @@ static PyObject *SceneObSeq_new( BPy_SceneObSeq * self, PyObject *args ) return EXPP_ReturnPyObjError( PyExc_TypeError, "scene.objects.new(obdata) - expected obdata to be\n\ta python obdata type or the string 'Empty'" ); - if( Armature_CheckPyObject( py_data ) ) { + if( BPy_Armature_Check( py_data ) ) { data = ( void * ) Armature_FromPyObject( py_data ); type = OB_ARMATURE; - } else if( Camera_CheckPyObject( py_data ) ) { + } else if( BPy_Camera_Check( py_data ) ) { data = ( void * ) Camera_FromPyObject( py_data ); type = OB_CAMERA; - } else if( Lamp_CheckPyObject( py_data ) ) { + } else if( BPy_Lamp_Check( py_data ) ) { data = ( void * ) Lamp_FromPyObject( py_data ); type = OB_LAMP; - } else if( Curve_CheckPyObject( py_data ) ) { + } else if( BPy_Curve_Check( py_data ) ) { data = ( void * ) Curve_FromPyObject( py_data ); type = OB_CURVE; - } else if( NMesh_CheckPyObject( py_data ) ) { + } else if( BPy_NMesh_Check( py_data ) ) { data = ( void * ) NMesh_FromPyObject( py_data, NULL ); type = OB_MESH; if( !data ) /* NULL means there is already an error */ return NULL; - } else if( Mesh_CheckPyObject( py_data ) ) { + } else if( BPy_Mesh_Check( py_data ) ) { data = ( void * ) Mesh_FromPyObject( py_data, NULL ); type = OB_MESH; - } else if( Lattice_CheckPyObject( py_data ) ) { + } else if( BPy_Lattice_Check( py_data ) ) { data = ( void * ) Lattice_FromPyObject( py_data ); type = OB_LATTICE; - } else if( Metaball_CheckPyObject( py_data ) ) { + } else if( BPy_Metaball_Check( py_data ) ) { data = ( void * ) Metaball_FromPyObject( py_data ); type = OB_MBALL; - } else if( Text3d_CheckPyObject( py_data ) ) { + } else if( BPy_Text3d_Check( py_data ) ) { data = ( void * ) Text3d_FromPyObject( py_data ); type = OB_FONT; } else if( ( desc = PyString_AsString( (PyObject *)py_data ) ) != NULL ) { |