[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18714] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 18714
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18714
Author:   ton
Date:     2009-01-28 13:28:50 +0100 (Wed, 28 Jan 2009)

Log Message:
-----------
2.5

Bugfix in last commit: the read-file hotkey (enter) has to be in
the window handler queue, so it nicely exits all queues without
using free'd data.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
    branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-01-28 12:28:50 UTC (rev 18714)
@@ -506,7 +506,7 @@
 	
 	/* api callbacks */
 	ot->exec= file_load_exec;
-	ot->poll= ED_operator_file_active;
+	ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
 }
 
 

Modified: branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c	2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/editors/space_file/space_file.c	2009-01-28 12:28:50 UTC (rev 18714)
@@ -261,6 +261,7 @@
 	WM_operatortype_append(ED_FILE_OT_cancel);
 }
 
+/* NOTE: do not add .blend file reading on this level */
 void file_keymap(struct wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "File", SPACE_FILE, 0);
@@ -268,7 +269,6 @@
 	WM_keymap_add_item(keymap, "ED_FILE_OT_select_all", AKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "ED_FILE_OT_border_select", BKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "ED_FILE_OT_highlight", MOUSEMOVE, KM_ANY, 0, 0);
-	WM_keymap_add_item(keymap, "ED_FILE_OT_load", RETKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "ED_FILE_OT_cancel", ESCKEY, KM_PRESS, 0, 0);
 	
 	WM_keymap_add_item(keymap, "ED_FILE_OT_loadimages", TIMER1, KM_ANY, KM_ANY, 0);

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2009-01-28 12:28:50 UTC (rev 18714)
@@ -529,6 +529,8 @@
 
 		WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL);
 //		refresh_interface_font();
+					   
+		CTX_wm_window_set(C, NULL); /* exits queues */
 	}
 //	else if(retval==1)
 // XXX		BIF_undo_push("Import file");

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c	2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c	2009-01-28 12:28:50 UTC (rev 18714)
@@ -1171,5 +1171,6 @@
 	WM_keymap_verify_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "ED_FILE_OT_load", RETKEY, KM_PRESS, 0, 0);
 }