Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-06-01 06:48:36 +0400
committerCampbell Barton <ideasman42@gmail.com>2007-06-01 06:48:36 +0400
commit3d6f9b804fce3779a10ecdcdfeed46c75f9adef4 (patch)
tree93421f7c6a694018f3c3a5bd24e3b4efcbdafed3 /source
parentf19b56a541c1c8923fc64adefd7e250c5b55b965 (diff)
buttons editing didnt let lib-obdata to changed once set (thanks for the report broken)
NMesh (error in last commit).
Diffstat (limited to 'source')
-rw-r--r--source/blender/python/api2_2x/NMesh.c4
-rw-r--r--source/blender/src/buttons_editing.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c
index b0ab64a6249..3c7a15a537a 100644
--- a/source/blender/python/api2_2x/NMesh.c
+++ b/source/blender/python/api2_2x/NMesh.c
@@ -1303,7 +1303,7 @@ static PyObject *NMesh_getSelectedFaces( PyObject * self, PyObject * args )
totfaces= me->totface;
if( flag ) {
- for( i = 0; i < me->totface; i++ ) {
+ for( i = 0; i < totfaces; i++ ) {
if( mf[i].flag & ME_FACE_SEL ) {
pyval = PyInt_FromLong( i );
PyList_Append( l, pyval );
@@ -1311,7 +1311,7 @@ static PyObject *NMesh_getSelectedFaces( PyObject * self, PyObject * args )
}
}
} else {
- for( i = 0; i < me->totface; i++ ) {
+ for( i = 0; i < totfaces; i++ ) {
if( mf[i].flag & ME_FACE_SEL )
PyList_Append( l, PyList_GetItem( nm->faces, i ) );
}
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 3760b17f039..ec2b7b3b274 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -4447,7 +4447,7 @@ static void editing_panel_links(Object *ob)
block= uiNewBlock(&curarea->uiblocks, "editing_panel_links", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Link and Materials", "Editing", 0, 0, 318, 204)==0) return;
- uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+ uiSetButLock((ob && ob->id.lib), ERROR_LIBDATA_MESSAGE);
buttons_active_id(&id, &idfrom);