[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26345] trunk/blender/release/scripts/ui/ space_userpref.py: [#20808] r26221 - Cannot remove shortcuts in user preferences @ modified configuration

[Martin Poirier]

Revision: 26345
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26345
Author:   theeth
Date:     2010-01-27 17:13:05 +0100 (Wed, 27 Jan 2010)

Log Message:
-----------
[#20808] r26221 - Cannot remove shortcuts in user preferences @ modified configuration

keymap in context was wrong after modal keymap was shown.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-01-27 15:30:20 UTC (rev 26344)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-01-27 16:13:05 UTC (rev 26345)
@@ -1097,6 +1097,8 @@
                     self.draw_entry(kc, entry, col, level + 1)
 
     def draw_kmi(self, kc, km, kmi, layout, level):
+        # reset keymap pointer, it might get changed by modal keymaps added after keymap items
+        layout.set_context_pointer("keymap", km)
         layout.set_context_pointer("keyitem", kmi)
 
         col = self.indented_layout(layout, level)