Fix pyblish#309

davidlatwe · Jan 9, 2019 · c5c2d19 · c5c2d19
1 parent 4449e5c
commit c5c2d19
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/pyblish_qml/control.py b/pyblish_qml/control.py
@@ -517,25 +517,28 @@ def toggleInstance(self, index):
     def toggleSection(self, checkState, sectionLabel):
         model = self.data["models"]["item"]
 
-        states = set([item.isToggled for item in model.items
-                      if (item.itemType == "instance" and
-                          sectionLabel == item.category)])
+        states = set()
+        for item in model.items:
+            if item.itemType == "instance" and sectionLabel == item.category:
+                if item.optional:
+                    states.add(item.isToggled)
+            if item.itemType == "plugin" and sectionLabel == item.verb:
+                if item.optional:
+                    states.add(item.isToggled)
 
         if len(states) == 1:
             checkState = not states.pop()
 
         for item in model.items:
             if item.itemType == "instance" and sectionLabel == item.category:
-                if item.isToggled != checkState:
+                if item.isToggled != checkState and item.optional:
                     self.__toggle_item(model,
                                        model.items.index(item))
 
-            if item.itemType == "plugin" and item.optional:
-                if item.verb == sectionLabel:
-                    if item.isToggled != checkState:
-                        self.__toggle_item(
-                            model,
-                            model.items.index(item))
+            if item.itemType == "plugin" and sectionLabel == item.verb:
+                if item.isToggled != checkState and item.optional:
+                    self.__toggle_item(model,
+                                       model.items.index(item))
 
     @QtCore.pyqtSlot(bool, str)
     def hideSection(self, hideState, sectionLabel):