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

- fix issues in with Mesh_fromNMesh pointed out by Ton earlier; errors from

Browse Source 
Python routines should properly be propagated back to give an error as
  intended.
This commit is contained in:
Ken Hughes
2005-10-30 03:05:54 +00:00
parent 4664db4872
commit cb9988332a
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/api2_2x/Object.c
View File

@@ -1486,9 +1486,11 @@ static PyObject *Object_link( BPy_Object * self, PyObject * args )
data = ( void * ) Lamp_FromPyObject( py_data );
else if( Curve_CheckPyObject( py_data ) )
data = ( void * ) Curve_FromPyObject( py_data );
else if( NMesh_CheckPyObject( py_data ) )
else if( NMesh_CheckPyObject( py_data ) ) {
data = ( void * ) NMesh_FromPyObject( py_data, self->object );
else if( Mesh_CheckPyObject( py_data ) )
if( !data ) /* NULL means there is already an error */
return NULL;
} else if( Mesh_CheckPyObject( py_data ) )
data = ( void * ) Mesh_FromPyObject( py_data, self->object );
else if( Lattice_CheckPyObject( py_data ) )
data = ( void * ) Lattice_FromPyObject( py_data );