[Bf-extensions-cvs] [1f161da1] blender-v2.83-release: Collection Manager: Global Exclude RTO fix. Task: T69577

[Ryan Inch]

Commit: 1f161da140806c8ac441c7108973036307800d81
Author: Ryan Inch
Date:   Mon May 11 00:40:00 2020 -0400
Branches: blender-v2.83-release
https://developer.blender.org/rBA1f161da140806c8ac441c7108973036307800d81

Collection Manager: Global Exclude RTO fix. Task: T69577

Fix the Global Exclude RTO unnecessarily resetting the active collection
to the Scene Collection.

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

M	object_collection_manager/__init__.py
M	object_collection_manager/operators.py

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

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 5c3edb7a..dcb4daf0 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, 7, 21),
+    "version": (2, 7, 22),
     "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/operators.py b/object_collection_manager/operators.py
index ce39867e..4d028cf2 100644
--- a/object_collection_manager/operators.py
+++ b/object_collection_manager/operators.py
@@ -412,6 +412,7 @@ class CMUnExcludeAllOperator(Operator):
     def invoke(self, context, event):
         global rto_history
 
+        orig_active_collection = context.view_layer.active_layer_collection
         view_layer = context.view_layer.name
         modifiers = get_modifiers(event)
 
@@ -436,6 +437,9 @@ class CMUnExcludeAllOperator(Operator):
         else:
             activate_all_rtos(view_layer, "exclude")
 
+        # reset active collection
+        context.view_layer.active_layer_collection = orig_active_collection
+
         return {'FINISHED'}