[Bf-extensions-cvs] [8139c916] master: Collection Manager: Update Toggle Nested. Task T69577

Ryan Inch noreply at git.blender.org
Wed Apr 15 10:06:12 CEST 2020


Commit: 8139c91615608ce627335e3efae79d1074ba7191
Author: Ryan Inch
Date:   Wed Apr 15 02:47:52 2020 -0400
Branches: master
https://developer.blender.org/rBA8139c91615608ce627335e3efae79d1074ba7191

Collection Manager: Update Toggle Nested. Task T69577

Update the toggle_children function to account for the new changes
introduced to the exclude RTO with D7016.

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

M	object_collection_manager/__init__.py
M	object_collection_manager/operator_utils.py

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

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 0f2443f2..4a2c9bf6 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,6),
+    "version": (2,7,7),
     "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/operator_utils.py b/object_collection_manager/operator_utils.py
index 4daed884..02644954 100644
--- a/object_collection_manager/operator_utils.py
+++ b/object_collection_manager/operator_utils.py
@@ -161,21 +161,17 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
 
 def toggle_children(self, view_layer, rto):
     laycol_ptr = layer_collections[self.name]["ptr"]
-    # reset exclude history
+    # reset rto history
     del rto_history[rto][view_layer]
 
-    if rto == "exclude":
-        laycol_ptr.exclude = not laycol_ptr.exclude
-
-    else:
-        # toggle selectability of collection
-        state = not get_rto(laycol_ptr, rto)
-        set_rto(laycol_ptr, rto, state)
+    # toggle rto state
+    state = not get_rto(laycol_ptr, rto)
+    set_rto(laycol_ptr, rto, state)
 
-        def set_state(layer_collection):
-            set_rto(layer_collection, rto, state)
+    def set_state(layer_collection):
+        set_rto(layer_collection, rto, state)
 
-        apply_to_children(laycol_ptr, set_state)
+    apply_to_children(laycol_ptr, set_state)
 
 
 def activate_all_rtos(view_layer, rto):



More information about the Bf-extensions-cvs mailing list