From 1cc09e24c5163ccba2bcb6250da57dd649fb9151 Mon Sep 17 00:00:00 2001
From: Ryan Inch <mythologylover75@gmail.com>
Date: Fri, 8 Jul 2022 23:32:32 -0400
Subject: [PATCH] Collection Manager: Fix T99142.  Task: T69577

Fix duplicate keymap entries for QVT operators.
---
 object_collection_manager/__init__.py |  2 +-
 object_collection_manager/qcd_init.py | 46 +++++++++++++--------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index fd53b291f..1c0c7267d 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -6,7 +6,7 @@ bl_info = {
     "name": "Collection Manager",
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
-    "version": (2, 24, 1),
+    "version": (2, 24, 2),
     "blender": (2, 80, 0),
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel
diff --git a/object_collection_manager/qcd_init.py b/object_collection_manager/qcd_init.py
index 1273e6e03..c2d555f5e 100644
--- a/object_collection_manager/qcd_init.py
+++ b/object_collection_manager/qcd_init.py
@@ -135,8 +135,8 @@ def register_qcd_view_hotkeys():
             ["ZERO", True, "20"],
         ]
 
-        for key in qcd_hotkeys:
-            for mode in ['Object Mode', 'Pose', 'Weight Paint']:
+        for mode in ['Object Mode', 'Pose', 'Weight Paint']:
+            for key in qcd_hotkeys:
                 km = wm.keyconfigs.addon.keymaps.new(name=mode)
                 kmi = km.keymap_items.new('view3d.view_qcd_slot', key[0], 'PRESS', alt=key[1])
                 kmi.properties.slot = key[2]
@@ -149,34 +149,34 @@ def register_qcd_view_hotkeys():
                 kmi.properties.toggle = True
                 addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.enable_all_qcd_slots', 'PLUS', 'PRESS', shift=True)
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.enable_all_qcd_slots', 'PLUS', 'PRESS', shift=True)
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.isolate_selected_objects_collections', 'EQUAL', 'PRESS')
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.isolate_selected_objects_collections', 'EQUAL', 'PRESS')
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.disable_selected_objects_collections', 'MINUS', 'PRESS')
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.disable_selected_objects_collections', 'MINUS', 'PRESS')
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, alt=True)
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.disable_all_non_qcd_slots', 'PLUS', 'PRESS', shift=True, alt=True)
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.disable_all_collections', 'EQUAL', 'PRESS', alt=True, ctrl=True)
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.disable_all_collections', 'EQUAL', 'PRESS', alt=True, ctrl=True)
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.select_all_qcd_objects', 'PLUS', 'PRESS', shift=True, ctrl=True)
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.select_all_qcd_objects', 'PLUS', 'PRESS', shift=True, ctrl=True)
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
 
-                km = wm.keyconfigs.addon.keymaps.new(name=mode)
-                kmi = km.keymap_items.new('view3d.discard_qcd_history', 'EQUAL', 'PRESS', alt=True)
-                addon_qcd_view_hotkey_keymaps.append((km, kmi))
+            km = wm.keyconfigs.addon.keymaps.new(name=mode)
+            kmi = km.keymap_items.new('view3d.discard_qcd_history', 'EQUAL', 'PRESS', alt=True)
+            addon_qcd_view_hotkey_keymaps.append((km, kmi))
 
 
 def register_qcd_view_edit_mode_hotkeys():
-- 
GitLab