Merge branch 'blender-v2.82-release'

2 files changed, 0 insertions, 27 deletions

diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h
index 4a9a9cf8705..16c072afccf 100644
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@ -55,8 +55,6 @@ void WM_keyconfig_update_operatortype(void);
 
 void WM_keymap_clear(struct wmKeyMap *keymap);
 
-wmKeyMapItem *WM_keymap_verify_item(
-    struct wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier);
 wmKeyMapItem *WM_keymap_add_item(
     struct wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier);
 wmKeyMapItem *WM_keymap_add_item_copy(struct wmKeyMap *keymap, wmKeyMapItem *kmi_src);
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 4e7a7bf96f1..1809a233ce1 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -505,31 +505,6 @@ static void keymap_item_set_id(wmKeyMap *keymap, wmKeyMapItem *kmi)
   }
 }
 
-/* if item was added, then bail out */
-wmKeyMapItem *WM_keymap_verify_item(
-    wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
-{
-  wmKeyMapItem *kmi;
-
-  for (kmi = keymap->items.first; kmi; kmi = kmi->next) {
-    if (STREQLEN(kmi->idname, idname, OP_MAX_TYPENAME)) {
-      break;
-    }
-  }
-  if (kmi == NULL) {
-    kmi = MEM_callocN(sizeof(wmKeyMapItem), "keymap entry");
-
-    BLI_addtail(&keymap->items, kmi);
-    BLI_strncpy(kmi->idname, idname, OP_MAX_TYPENAME);
-
-    keymap_item_set_id(keymap, kmi);
-
-    keymap_event_set(kmi, type, val, modifier, keymodifier);
-    wm_keymap_item_properties_set(kmi);
-  }
-  return kmi;
-}
-
 /* always add item */
 wmKeyMapItem *WM_keymap_add_item(
     wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)