Revision: 18828
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18828
Author: ton
Date: 2009-02-06 12:11:42 +0100 (Fri, 06 Feb 2009)
Log Message:
-----------
2.5
Bugfix: on reading multiple pre-2.5 files, the keymaps were generated
again, causing items to be added double.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-06 10:52:10 UTC (rev 18827)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-06 11:11:42 UTC (rev 18828)
@@ -428,8 +428,8 @@
2- no current wm, but read wm: that's OK, do nothing
3- current wm, but not in file: try match screen names
4- current wm, and wm in file: try match ghostwin
+*/
-*/
static void wm_window_match_do(bContext *C, ListBase *oldwmlist)
{
wmWindowManager *oldwm, *wm;
@@ -444,13 +444,11 @@
else {
/* cases 3 and 4 */
- /* we've read file without wm... */
+ /* we've read file without wm..., keep current one entirely
alive */
if(G.main->wm.first==NULL) {
/* match oldwm to new dbase, only old files */
for(wm= oldwmlist->first; wm; wm= wm->id.next) {
- /* ensure making new keymaps and set space
types */
- wm->initialized= 0;
for(win= wm->windows.first; win; win=
win->next) {
/* all windows get active screen from
file */
@@ -464,6 +462,9 @@
/* XXX still solve, case where multiple windows open */
G.main->wm= *oldwmlist;
+
+ /* screens were read from file! */
+ ED_screens_initialize(G.main->wm.first);
}
else {
/* what if old was 3, and loaded 1? */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
