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

When converting from TF_SELECT to use the mfaces selection flag only I missed getSelectedFaces.

Browse Source 
This broke theeths UV-Exportscript.
updated and added 2 missing decref's, as well as a check not to write a list of faces greater then the size of the NMesh (mesh and NMesh face lengths can differ)
This commit is contained in:
Campbell Barton
2007-06-01 02:33:23 +00:00
parent 1a9f0e692a
commit f19b56a541
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1278,23 +1278,33 @@ static PyObject *NMesh_getSelectedFaces( PyObject * self, PyObject * args )
Mesh *me = nm->mesh;
int flag = 0;
MTFace *tf;
MFace *mf;
int i;
PyObject *l = PyList_New( 0 ), *pyval;
if( me == NULL )
return NULL;
/* dont allow returning more then the NMesh's number of faces */
int totfaces = PySequence_Length(nm->faces);
tf = me->mtface;
if( tf == 0 )
if( me == NULL ) {
Py_DECREF(l);
return NULL;
}
mf = me->mface;
if( mf == NULL )
return l;
if( !PyArg_ParseTuple( args, "|i", &flag ) )
if( !PyArg_ParseTuple( args, "|i", &flag ) ) {
Py_DECREF(l);
return NULL;
}
/* make sure not to write more faces then we have */
if (totfaces > me->totface)
totfaces= me->totface;
if( flag ) {
for( i = 0; i < me->totface; i++ ) {
if( tf[i].flag & TF_SELECT ) {
if( mf[i].flag & ME_FACE_SEL ) {
pyval = PyInt_FromLong( i );
PyList_Append( l, pyval );
Py_DECREF(pyval);
@@ -1302,7 +1312,7 @@ static PyObject *NMesh_getSelectedFaces( PyObject * self, PyObject * args )
}
} else {
for( i = 0; i < me->totface; i++ ) {
if( tf[i].flag & TF_SELECT )
if( mf[i].flag & ME_FACE_SEL )
PyList_Append( l, PyList_GetItem( nm->faces, i ) );
}
}