Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-01-21 05:10:50 +0300
committerMatt Ebb <matt@mke3.net>2010-01-21 05:10:50 +0300
commit467cece2c18516ecc3e347e411776b55c5b4b873 (patch)
treeb09c03eade178682377a3a4907b6ea1878819d26
parente74bc901d3b88fab7b4774bba7e1d97a29efe34c (diff)
Fix for key map python file export and load
Contributed by 'freakabcd' in IRC.
-rw-r--r--release/scripts/ui/space_userpref.py2
-rw-r--r--source/blender/makesrna/intern/rna_wm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index c8672d3b95e..05e5f70af4d 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -1458,7 +1458,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator):
f.write('# Configuration %s\n' % kc.name)
- f.write("wm = bpy.data.windowmanagers[0]\n")
+ f.write("wm = bpy.data.window_managers[0]\n")
f.write("kc = wm.add_keyconfig(\'%s\')\n\n" % kc.name)
for km in kc.keymaps:
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index a3a2bc35dc1..fd3ee81334b 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -64,7 +64,7 @@ EnumPropertyItem event_value_items[] = {
{KM_PRESS, "PRESS", 0, "Press", ""},
{KM_RELEASE, "RELEASE", 0, "Release", ""},
{KM_CLICK, "CLICK", 0, "Click", ""},
- {KM_DBL_CLICK, "DOUBLECLICK", 0, "Double Click", ""},
+ {KM_DBL_CLICK, "DOUBLE_CLICK", 0, "Double Click", ""},
{0, NULL, 0, NULL, NULL}};
EnumPropertyItem event_tweak_type_items[]= {