[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40673] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix #28726: maya key configuration lost after file > new.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Sep 28 21:05:47 CEST 2011


Revision: 40673
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40673
Author:   blendix
Date:     2011-09-28 19:05:47 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Fix #28726: maya key configuration lost after file > new.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-09-28 18:49:05 UTC (rev 40672)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-09-28 19:05:47 UTC (rev 40673)
@@ -226,14 +226,17 @@
 			oldwm= oldwmlist->first;
 			wm= G.main->wm.first;
 
-			/* move addon key configuration to new wm, to preserve their keymaps */
-			if(oldwm->addonconf) {
-				wm->addonconf= oldwm->addonconf;
-				BLI_remlink(&oldwm->keyconfigs, oldwm->addonconf);
-				oldwm->addonconf= NULL;
-				BLI_addtail(&wm->keyconfigs, wm->addonconf);
-			}
+			/* preserve key configurations in new wm, to preserve their keymaps */
+			wm->keyconfigs= oldwm->keyconfigs;
+			wm->addonconf= oldwm->addonconf;
+			wm->defaultconf= oldwm->defaultconf;
+			wm->userconf= oldwm->userconf;
 
+			oldwm->keyconfigs.first= oldwm->keyconfigs.last= NULL;
+			oldwm->addonconf= NULL;
+			oldwm->defaultconf= NULL;
+			oldwm->userconf= NULL;
+
 			/* ensure making new keymaps and set space types */
 			wm->initialized= 0;
 			wm->winactive= NULL;




More information about the Bf-blender-cvs mailing list