griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

-- fix compiler warning about return "from incompatible pointer type" when

Browse Source 
returning Python exceptions.  EXPP_ReturnPyObjError() always returns a
   NULL because Python expects error conditions to return a NULL pointer
   instead of an object.  Since the pointer is cast to a PyObject *, it's
   ugly to use for propagating the errors back in this case, so this fix just
   uses PyErr_SetString() to set the error and return NULL (see the body
   of EXPP_ReturnPyObjError() ).
This commit is contained in:
Ken Hughes
2005-10-30 14:34:48 +00:00
parent ea8b08c2cc
commit 4d2de0293e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/python/api2_2x/NMesh.c
View File

@@ -1465,16 +1465,20 @@ Mesh *Mesh_fromNMesh( BPy_NMesh * nmesh , int store_edges )
mesh = add_mesh( );
if( !mesh )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"FATAL: could not create mesh object" );
if( !mesh ) {
PyErr_SetString( PyExc_RuntimeError,
"FATAL: could not create mesh object" );
return NULL;
}
mesh->id.us = 0; /* no user yet */
G.totmesh++;
if( !convert_NMeshToMesh( mesh, nmesh, store_edges ) )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
if( !convert_NMeshToMesh( mesh, nmesh, store_edges ) ) {
PyErr_SetString( PyExc_RuntimeError,
"faces must have at 3 or 4 vertices" );
return NULL;
}
return mesh;
}
@@ -3413,8 +3417,9 @@ Mesh *NMesh_FromPyObject( PyObject * pyobj, Object * ob )
return mesh;
}
return EXPP_ReturnPyObjError( PyExc_AttributeError,
PyErr_SetString( PyExc_AttributeError,
"link argument type is not supported " );
return NULL;
}
#define POINTER_CROSS_EQ(a1, a2, b1, b2) (((a1)==(b1) && (a2)==(b2)) || ((a1)==(b2) && (a2)==(b1)))