[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10838] trunk/blender/source/blender: buttons editing didnt let lib-obdata to changed once set ( thanks for the report broken)

Campbell Barton cbarton at metavr.com
Fri Jun 1 04:48:36 CEST 2007


Revision: 10838
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10838
Author:   campbellbarton
Date:     2007-06-01 04:48:36 +0200 (Fri, 01 Jun 2007)

Log Message:
-----------
buttons editing didnt let lib-obdata to changed once set (thanks for the report broken)
NMesh (error in last commit).

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/NMesh.c
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/source/blender/python/api2_2x/NMesh.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/NMesh.c	2007-06-01 02:33:23 UTC (rev 10837)
+++ trunk/blender/source/blender/python/api2_2x/NMesh.c	2007-06-01 02:48:36 UTC (rev 10838)
@@ -1303,7 +1303,7 @@
 		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 @@
 			}
 		}
 	} 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 ) );
 		}

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2007-06-01 02:33:23 UTC (rev 10837)
+++ trunk/blender/source/blender/src/buttons_editing.c	2007-06-01 02:48:36 UTC (rev 10838)
@@ -4447,7 +4447,7 @@
 	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);
 	





More information about the Bf-blender-cvs mailing list