Merging r39050 through r39101 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / resources.c
index bc179d584aba39f86ac73ec02a4ef11de4a91523..aeacdac5d141eaed557c178af9324bb7a7cc3856 100644 (file)
@@ -1463,7 +1463,7 @@ void init_userdef_do_versions(void)
        if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 8)) {
                wmKeyMap *km;
                
-               for(km=U.keymaps.first; km; km=km->next) {
+               for(km=U.user_keymaps.first; km; km=km->next) {
                        if (strcmp(km->idname, "Armature_Sketch")==0)
                                strcpy(km->idname, "Armature Sketch");
                        else if (strcmp(km->idname, "View3D")==0)