[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35684] trunk/blender/release/scripts: poll functions were for keymap operators were still raising errors in some cases .

Campbell Barton ideasman42 at gmail.com
Tue Mar 22 09:21:16 CET 2011


Revision: 35684
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35684
Author:   campbellbarton
Date:     2011-03-22 08:21:16 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
poll functions were for keymap operators were still raising errors in some cases.
remove unused script dirs.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py

Removed Paths:
-------------
    trunk/blender/release/scripts/io/
    trunk/blender/release/scripts/keyingsets/

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-03-22 04:28:51 UTC (rev 35683)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-03-22 08:21:16 UTC (rev 35684)
@@ -710,7 +710,8 @@
 
     @classmethod
     def poll(cls, context):
-        return hasattr(context, "keymap") and context.keymap.is_user_defined
+        keymap = getattr(context, "keymap", None)
+        return keymap and keymap.is_user_defined
 
     def execute(self, context):
         km = context.keymap
@@ -772,7 +773,8 @@
     @classmethod
     def poll(cls, context):
         wm = context.window_manager
-        return wm.keyconfigs.active.is_user_defined
+        keyconf = wm.keyconfigs.active
+        return keyconf and keyconf.is_user_defined
 
     def execute(self, context):
         wm = context.window_manager




More information about the Bf-blender-cvs mailing list