[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13635] trunk/blender/source/blender: World settings ambient occlusion could be set even when its a library

[Campbell Barton]

Revision: 13635
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13635
Author:   campbellbarton
Date:     2008-02-11 04:16:22 +0100 (Mon, 11 Feb 2008)

Log Message:
-----------
World settings ambient occlusion could be set even when its a library
making local objects with a dupligroup didnt disable the indirect flag, also made the tool respect visible and restricted flags.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/src/buttons_shading.c
    trunk/blender/source/blender/src/editobject.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2008-02-10 23:40:58 UTC (rev 13634)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2008-02-11 03:16:22 UTC (rev 13635)
@@ -1178,6 +1178,7 @@
 	id_lib_extern((ID *)ob->action);
 	id_lib_extern((ID *)ob->ipo);
 	id_lib_extern((ID *)ob->data);
+	id_lib_extern((ID *)ob->dup_group);
 	
 	for(a=0; a<ob->totcol; a++) {
 		id_lib_extern((ID *)ob->mat[a]);

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2008-02-10 23:40:58 UTC (rev 13634)
+++ trunk/blender/source/blender/src/buttons_shading.c	2008-02-11 03:16:22 UTC (rev 13635)
@@ -2145,7 +2145,9 @@
 	block= uiNewBlock(&curarea->uiblocks, "world_panel_amb_oc", UI_EMBOSS, UI_HELV, curarea->win);
 	uiNewPanelTabbed("Mist / Stars / Physics", "World");
 	if(uiNewPanel(curarea, block, "Amb Occ", "World", PANELX, PANELY, PANELW, PANELH)==0) return;
-
+	uiSetButLock(wrld->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+	
+	
 	uiBlockSetCol(block, TH_BUT_SETTING1);
 	uiDefButBitS(block, TOG, WO_AMB_OCC, B_REDR, "Ambient Occlusion",
 		X2CLM1, yco-=BUTH, BUTW1, BUTH, &wrld->mode, 0, 0, 0, 0, "Toggles ambient occlusion (soft shadows)");

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2008-02-10 23:40:58 UTC (rev 13634)
+++ trunk/blender/source/blender/src/editobject.c	2008-02-11 03:16:22 UTC (rev 13635)
@@ -4634,8 +4634,8 @@
 	
 	base= FIRSTBASE;
 	while(base) {
-		ob= base->object;
-		if( (base->flag & SELECT)) {
+		if( TESTBASE(base) ) {
+			ob= base->object;
 			if(ob->id.lib) {
 				make_local_object(ob);
 			}
@@ -4646,8 +4646,8 @@
 	/* maybe object pointers */
 	base= FIRSTBASE;
 	while(base) {
-		ob= base->object;
-		if( (base->flag & SELECT)) {
+		if( TESTBASE(base) ) {
+			ob= base->object;
 			if(ob->id.lib==NULL) {
 				ID_NEW(ob->parent);
 				ID_NEW(ob->track);
@@ -4658,9 +4658,8 @@
 
 	base= FIRSTBASE;
 	while(base) {
-		ob= base->object;
-		if( (base->flag & SELECT) ) {
-	
+		if( TESTBASE(base) ) {
+			ob= base->object;
 			id= ob->data;
 			
 			if(id && mode>1) {
@@ -4720,9 +4719,8 @@
 	if(mode>1) {
 		base= FIRSTBASE;
 		while(base) {
-			ob= base->object;
-			if(base->flag & SELECT ) {
-				
+			if( TESTBASE(base) ) {
+				ob= base->object;
 				if(ob->type==OB_LAMP) {
 					la= ob->data;
 					for(b=0; b<MAX_MTEX; b++) {