[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23946] trunk/blender/source/blender/ windowmanager/intern/wm_keymap.c: Fix #19640: user defined keymaps did not use poll function.

[Brecht Van Lommel]

Revision: 23946
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23946
Author:   blendix
Date:     2009-10-19 13:11:35 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
Fix #19640: user defined keymaps did not use poll function.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c       
2009-10-19 11:04:56 UTC (rev 23945)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c       
2009-10-19 11:11:35 UTC (rev 23946)
@@ -415,15 +415,19 @@
        
        /* first user defined keymaps */
        km= wm_keymap_list_find(&U.keymaps, keymap->idname, keymap->spaceid, 
keymap->regionid);
-       if(km)
+       if(km) {
+               km->poll= keymap->poll; /* lazy init */
                return km;
+       }
        
        /* then user key config */
        keyconf= wm_keyconfig_list_find(&wm->keyconfigs, U.keyconfigstr);
        if(keyconf) {
                km= wm_keymap_list_find(&keyconf->keymaps, keymap->idname, 
keymap->spaceid, keymap->regionid);
-               if(km)
+               if(km) {
+                       km->poll= keymap->poll; /* lazy init */
                        return km;
+               }
        }
 
        /* then use default */


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs