Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Inch <mythologylover75@gmail.com>2021-05-10 08:44:11 +0300
committerRyan Inch <mythologylover75@gmail.com>2021-05-10 08:44:11 +0300
commit86194403316fe9fe7f5c857f9c10a20bb7b5a7d5 (patch)
treefa5ffd4f7bdd1416d537bc35120bb39996c745f3
parent8ea89b89c7d1f05798e5c6660456e80fd45e7362 (diff)
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.
-rw-r--r--object_collection_manager/__init__.py2
-rw-r--r--object_collection_manager/ui.py15
2 files changed, 13 insertions, 4 deletions
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):