[Bf-extensions-cvs] [86194403] blender-v2.93-release: Collection Manager: Fix phantom mode issue. Task: T69577

[Ryan Inch]

Commit: 86194403316fe9fe7f5c857f9c10a20bb7b5a7d5
Author: Ryan Inch
Date:   Mon May 10 01:44:11 2021 -0400
Branches: blender-v2.93-release
https://developer.blender.org/rBA86194403316fe9fe7f5c857f9c10a20bb7b5a7d5

Collection Manager: Fix phantom mode issue. Task: T69577

Fixes the add collection operators, undo operators, and specials menu
in the CM popup not being disabled when in phantom mode.

===================================================================

M	object_collection_manager/__init__.py
M	object_collection_manager/ui.py

===================================================================

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 0c475bdd..5dde35b2 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "name": "Collection Manager",
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
-    "version": (2, 21, 2),
+    "version": (2, 21, 3),
     "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/ui.py b/object_collection_manager/ui.py
index 09899581..045d4dda 100644
--- a/object_collection_manager/ui.py
+++ b/object_collection_manager/ui.py
@@ -143,8 +143,13 @@ class CollectionManager(Operator):
         right_sec = button_row_1.row()
         right_sec.alignment = 'RIGHT'
 
-        right_sec.menu("VIEW3D_MT_CM_specials_menu")
-        right_sec.popover(panel="COLLECTIONMANAGER_PT_display_options",
+        specials_menu = right_sec.row()
+        specials_menu.alignment = 'RIGHT'
+        specials_menu.menu("VIEW3D_MT_CM_specials_menu")
+
+        display_options = right_sec.row()
+        display_options.alignment = 'RIGHT'
+        display_options.popover(panel="COLLECTIONMANAGER_PT_display_options",
                            text="", icon='FILTER')
 
         mc_box = layout.box()
@@ -449,12 +454,16 @@ class CollectionManager(Operator):
 
         if cm.in_phantom_mode:
             view.enabled = False
+
             if prefs.enable_qcd:
                 renum_sec.enabled = False
 
+            undo_sec.enabled = False
+            specials_menu.enabled = False
+
             c_icon.enabled = False
             row_setcol.enabled = False
-            addcollec_row.enabled = False
+            button_row_2.enabled = False
 
 
     def execute(self, context):