[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26931] trunk/blender/source/blender/ windowmanager/intern/wm_keymap.c: Fix #21116: wrong shortcut key in view navigation menu.

[Brecht Van Lommel]

Revision: 26931
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26931
Author:   blendix
Date:     2010-02-15 15:15:34 +0100 (Mon, 15 Feb 2010)

Log Message:
-----------
Fix #21116: wrong shortcut key in view navigation menu.

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	2010-02-15 13:30:26 UTC (rev 26930)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2010-02-15 14:15:34 UTC (rev 26931)
@@ -480,7 +480,7 @@
 					ar= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
 				
 				if(ar)
-					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
 			}
 		}
 		else if(ELEM(opcontext, WM_OP_EXEC_REGION_CHANNELS, WM_OP_INVOKE_REGION_CHANNELS)) {
@@ -488,18 +488,18 @@
 					ar= BKE_area_find_region_type(sa, RGN_TYPE_CHANNELS);
 				
 				if(ar)
-					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
 		}
 		else if(ELEM(opcontext, WM_OP_EXEC_REGION_PREVIEW, WM_OP_INVOKE_REGION_PREVIEW)) {
 			if (!(ar && ar->regiontype == RGN_TYPE_PREVIEW))
 					ar= BKE_area_find_region_type(sa, RGN_TYPE_PREVIEW);
 				
 				if(ar)
-					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+					found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
 		}
 		else {
 			if(ar)
-				found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, hotkey, compare_props, keymap_r);
+				found= wm_keymap_item_find_handlers(C, &ar->handlers, opname, opcontext, properties, compare_props, hotkey, keymap_r);
 		}
 	}
 	
@@ -511,7 +511,7 @@
 	wmKeyMapItem *found= wm_keymap_item_find_props(C, opname, opcontext, properties, 1, hotkey, keymap_r);
 
 	if(!found)
-		found= wm_keymap_item_find_props(C, opname, opcontext, properties, 0, hotkey, keymap_r);
+		found= wm_keymap_item_find_props(C, opname, opcontext, NULL, 0, hotkey, keymap_r);
 
 	return found;
 }