[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13079] trunk/blender/source/blender/src: find external files wasnt finding the biggest screen area for the file selector ,

[Campbell Barton]

Revision: 13079
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13079
Author:   campbellbarton
Date:     2008-01-01 03:20:13 +0100 (Tue, 01 Jan 2008)

Log Message:
-----------
find external files wasnt finding the biggest screen area for the file selector,
other minor changes. renamed "Dump Screen" to "Screenshot" in the file menu.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawview.c
    trunk/blender/source/blender/src/header_info.c

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2008-01-01 01:00:05 UTC (rev 13078)
+++ trunk/blender/source/blender/src/drawview.c	2008-01-01 02:20:13 UTC (rev 13079)
@@ -1582,7 +1582,7 @@
 	if(ob->type==OB_MESH) {		
 		eve= em->verts.first;
 		while(eve) {
-			if(eve->f & 1) {
+			if(eve->f & SELECT) {
 				evedef= eve;
 				tot++;
 				VecAddf(median, median, eve->co);
@@ -1705,16 +1705,15 @@
 		Mat4MulVecfl(ob->obmat, median);
 	
 	if(block) {	// buttons
+		int but_y;
+		if((ob->parent) && (ob->partype == PARBONE))	but_y = 135;
+		else											but_y = 150;
+		
 		uiBlockBeginAlign(block);
-		if((ob->parent) && (ob->partype == PARBONE)) {
-			uiDefButBitS(block, TOG, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Global",		160, 135, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays global values");
-			uiDefButBitS(block, TOGN, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Local",		230, 135, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays local values");
-		}
-		else {
-			uiDefButBitS(block, TOG, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Global",		160, 150, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays global values");
-			uiDefButBitS(block, TOGN, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Local",		230, 150, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays local values");
-		}
-
+		uiDefButBitS(block, TOG, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Global",		160, but_y, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays global values");
+		uiDefButBitS(block, TOGN, V3D_GLOBAL_STATS, REDRAWVIEW3D, "Local",		230, but_y, 70, 19, &G.vd->flag, 0, 0, 0, 0, "Displays local values");
+		uiBlockEndAlign(block);
+		
 		memcpy(tfp->ve_median, median, sizeof(tfp->ve_median));
 		
 		uiBlockBeginAlign(block);
@@ -1779,7 +1778,7 @@
 			
 			eve= em->verts.first;
 			while(eve) {
-				if(eve->f & 1) {
+				if(eve->f & SELECT) {
 					VecAddf(eve->co, eve->co, median);
 				}
 				eve= eve->next;

Modified: trunk/blender/source/blender/src/header_info.c
===================================================================
--- trunk/blender/source/blender/src/header_info.c	2008-01-01 01:00:05 UTC (rev 13078)
+++ trunk/blender/source/blender/src/header_info.c	2008-01-01 02:20:13 UTC (rev 13079)
@@ -998,6 +998,11 @@
 		}
 		break;
 	case 13: /* search for referenced files that are not available  */
+		if(curarea->spacetype==SPACE_INFO) {
+			ScrArea *sa;
+			sa= closest_bigger_area();
+			areawinset(sa->win);
+		}
 		activate_fileselect(FILE_SPECIAL, "Find Missing Files", "", findMissingFiles);
 		break;
 	}
@@ -1061,9 +1066,9 @@
 
 	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Image...|F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump Subwindow|Ctrl F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump Screen|Ctrl Shift F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 25, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Rendered Image...|F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Screenshot Subwindow|Ctrl F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Screenshot All|Ctrl Shift F3",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 25, "");
 #if GAMEBLENDER == 1
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Runtime...",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 22, "");
 #ifdef _WIN32