Scripts:

- tiny updates for better behavior, unix line endings, cvs Id tags;
- Updated DX7 exporter (thanks to author Ben Omari who's also working on a DX8 one);
- added sysinfo script;

Interface (scripts):

- changed behavior for which win is chosen for script guis:
    Now there's a smarter order, guis will use either:
    - Scripts win
    - Buttons win (if not a script from groups Wizards or Utils)
    - Text win
    - Closest bigger area
- Added a button to the scripts header so that it's faster to return to the buttons win (this can be made general), if that was the previous win used.

2 files changed, 9 insertions, 14 deletions

diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index e8127931fed..6566c191291 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -673,13 +673,6 @@ static uiBlock *info_runtime_optionsmenu(void *arg_unused)
 static void do_info_file_importmenu(void *arg, int event)
 {
 	extern int BPY_menu_do_python(short menutype, int event);	// BPY_interface.c
-	ScrArea *sa;
-
-	if(curarea->spacetype==SPACE_INFO) {
-		sa= find_biggest_area_of_type(SPACE_SCRIPT);
-		if (!sa) sa= closest_bigger_area();
-		areawinset(sa->win);
-	}
 
 	BPY_menu_do_python(PYMENU_IMPORT, event);
 
@@ -710,13 +703,6 @@ static uiBlock *info_file_importmenu(void *arg_unused)
 static void do_info_file_exportmenu(void *arg, int event)
 {
 	extern int BPY_menu_do_python(short menutype, int event);	// BPY_interface.c
-	ScrArea *sa;
-
-	if(curarea->spacetype==SPACE_INFO) {
-		sa= find_biggest_area_of_type(SPACE_SCRIPT);
-		if (!sa) sa= closest_bigger_area();
-		areawinset(sa->win);
-	}
 
 	/* events >=3 are registered bpython scripts */
 	if (event >= 3) BPY_menu_do_python(PYMENU_EXPORT, event - 3);
diff --git a/source/blender/src/header_script.c b/source/blender/src/header_script.c
index 9b1d618ab7e..0ce38ec9846 100644
--- a/source/blender/src/header_script.c
+++ b/source/blender/src/header_script.c
@@ -202,6 +202,9 @@ void do_script_buttons(unsigned short event)
 			allqueue(REDRAWHEADERS, 0);
 		}
 		break;
+	case B_SCRIPT2BUTS:
+		newspace(curarea, SPACE_BUTS);
+		break;
 	}
 
 	return;
@@ -267,6 +270,12 @@ void script_buttons(void)
 	xco += 2*XIC;
 	xco= std_libbuttons(block, xco, 0, 0, NULL, B_SCRIPTBROWSE, (ID*)sc->script, 0, &(sc->menunr), 0, 0, 0, 0, 0);
 
+	if (sc->script && sc->script->lastspace == SPACE_BUTS) {
+		xco += 10;
+		uiDefIconBut(block, BUT, B_SCRIPT2BUTS, ICON_BUTS, xco+=XIC, 0, XIC, YIC,
+			0, 0, 0, 0, 0, "Returns to Buttons Window");
+	}
+
 	/* always as last  */
 	curarea->headbutlen= xco+2*XIC;