diff options
author | Ryan Inch <mythologylover75@gmail.com> | 2021-05-10 08:48:59 +0300 |
---|---|---|
committer | Ryan Inch <mythologylover75@gmail.com> | 2021-05-10 08:48:59 +0300 |
commit | 7324beddde4695ce952188f9cdb6e21a9631eeed (patch) | |
tree | 0f629e2ebc1013affc0fe419b0aa4bbd66e8f40e | |
parent | 7a4ed593f392ec067d26a22d1721707a9c9719b3 (diff) | |
parent | 86194403316fe9fe7f5c857f9c10a20bb7b5a7d5 (diff) |
Merge branch 'blender-v2.93-release'
-rw-r--r-- | object_collection_manager/__init__.py | 2 | ||||
-rw-r--r-- | object_collection_manager/ui.py | 15 |
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): |