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

removed warning in last commit

Browse Source
This commit is contained in:
Campbell Barton
2006-11-13 17:55:06 +00:00
parent 414904ec43
commit ef56538c62
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/python/api2_2x/Mesh.c
View File

@@ -5706,7 +5706,6 @@ static PyObject *Mesh_getFromObject( BPy_Mesh * self, PyObject * args )
{
Object *ob = NULL;
PyObject *object_arg;
char *name;
ID tmpid;
Mesh *tmpmesh;
Curve *tmpcu = NULL;
@@ -5721,8 +5720,11 @@ static PyObject *Mesh_getFromObject( BPy_Mesh * self, PyObject * args )
}
if ( PyString_Check( object_arg ) ) {
char *name;
name = PyString_AsString ( object_arg );
ob = ( Object * ) GetIdFromList( &( G.main->object ), name );
if( !ob )
return EXPP_ReturnPyObjError( PyExc_AttributeError, name );
} else if ( Object_CheckPyObject(object_arg) ) {
ob = (( BPy_Object * ) object_arg)->object;
} else {
@@ -5734,8 +5736,7 @@ static PyObject *Mesh_getFromObject( BPy_Mesh * self, PyObject * args )
return EXPP_ReturnPyObjError( PyExc_ValueError,
"cage value must be 0 or 1" );
if( !ob )
return EXPP_ReturnPyObjError( PyExc_AttributeError, name );
/* perform the mesh extraction based on type */
switch (ob->type) {

4
source/blender/python/api2_2x/doc/Mesh.py
View File

@@ -758,8 +758,8 @@ class Mesh:
be multiplied by the object's 4x4 transform matrix (see L{transform}).
@note: The objects materials will not be copied into the existing mesh,
however the face material indices will match the material list of the original data.
@type name: blender object or string
@param name: The Blender object or its name, which contains the geometry data.
@type object: blender object or string
@param object: The Blender object or its name, which contains the geometry data.
@type cage: int
@param cage: determines whether the original vertices or derived vertices
@type render: int