Merge branch '0.61_maintenance' into toolColorPlugFix

Changes.md

@@ -1,9 +1,15 @@
 0.61.x.x (relative to 0.61.11.0)
 =========
 
+Improvements
+------------
+
+- Spreadsheet : Added ability to load files saved in Gaffer 0.62.0.0a2 and later.
+
 Fixes
 -----
 
+- PlugLayout : Fixed visibility of collapsible layouts with nesting (#4694).
 - Image Node Mix : Fixed incorrect results outside mask data window, and incorrect results when changing inputs.
 - ColorSwatchPlugValueWidget : Fixed popup dialogue for plugs belonging to Tools.
 

python/GafferUI/PlugLayout.py

@@ -761,7 +761,10 @@ def update( self, section ) :
 
 			collapsible.getChild().update( subsection )
 
-			collapsible.setVisible( any ( [ w.getVisible() for w in subsection.widgets ] ) )
+			collapsible.setVisible(
+				any( [ w.getVisible() for w in subsection.widgets ] ) or
+				any( [ w.getVisible() for w in collapsible.getChild().__collapsibles.values() ] )
+			)
 
 			collapsible.getCornerWidget().setText(
 				"<small>" + "&nbsp;( " + subsection.summary + " )</small>" if subsection.summary else ""

startup/Gaffer/spreadsheetCompatibility.py

@@ -0,0 +1,52 @@
+##########################################################################
+#
+#  Copyright (c) 2022, Cinesite VFX Ltd. All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are
+#  met:
+#
+#      * Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      * Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials provided with
+#        the distribution.
+#
+#      * Neither the name of John Haddon nor the names of
+#        any other contributors to this software may be used to endorse or
+#        promote products derived from this software without specific prior
+#        written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+#  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+#  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##########################################################################
+
+import Gaffer
+
+def __getItemWrapper( originalGetItem ):
+
+	def getItem( self, key ):
+
+		# Allow loading of files saved in 0.62, where `activeRowNames`
+		# was renamed to `enabledRowNames`.
+		if key == "enabledRowNames":
+			key = "activeRowNames"
+
+		return originalGetItem( self, key )
+
+	return getItem
+
+Gaffer.Spreadsheet.__getitem__ = __getItemWrapper( Gaffer.Spreadsheet.__getitem__ )