[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26429] trunk/blender/source/blender/ windowmanager/intern/wm.c: Fix #20886: user defined keymap could be loaded before python scripts,

[Brecht Van Lommel]

Revision: 26429
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26429
Author:   blendix
Date:     2010-01-30 13:01:44 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix #20886: user defined keymap could be loaded before python scripts,
printing errors when that keymap included python operators.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm.c	2010-01-30 11:04:36 UTC (rev 26428)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c	2010-01-30 12:01:44 UTC (rev 26429)
@@ -190,11 +190,10 @@
 		/* create default key config */
 		wm_window_keymap(wm->defaultconf);
 		ED_spacetypes_keymap(wm->defaultconf);
+		WM_keyconfig_userdef(wm);
 
 		wm->initialized |= WM_INIT_KEYMAP;
 	}
-
-	WM_keyconfig_userdef(wm);
 }
 
 void WM_check(bContext *C)