RenderPassEditor : Allow active render pass to be toggled

Changes.md

@@ -18,6 +18,7 @@ Improvements
     - The `data_seed`, `proc_seed`, `obj_seed`, and `face_seed` parameters of the `color_jitter` shader.
 - EditScope : Added summaries of set membership edits in the NodeEditor.
 - LightEditor : Mute and solo columns now accurately reflect the presence of the `light:mute` attribute (for the Mute column) and membership in the `soloLights` set (for the Solo column) for all scene locations, not just for lights.
+- RenderPassEditor : The currently active render pass can now be unset by double clicking on its green dot in the "Active" column.
 
 Fixes
 -----

doc/source/Interface/ControlsAndShortcuts/index.md

@@ -437,4 +437,4 @@ Extend cell selection                                | {kbd}`Shift` + {{leftClic
 Toggle cell selection                                | {kbd}`Ctrl` + {{leftClick}}<br>or<br>{kbd}`Ctrl` + {kbd}`↑`, {kbd}`↓`, {kbd}`←`, {kbd}`→`
 Edit selected cells                                  | {kbd}`Return`<br>or<br>{kbd}`Enter`
 Disable edit                                         | {kbd}`D`
-Set a render pass as active                          | {kbd}`Return` or {{leftClick}} {{leftClick}} a cell within the {{activeRenderPass}} column
+Toggle a render pass as active                       | {kbd}`Return` or {{leftClick}} {{leftClick}} a cell within the {{activeRenderPass}} column

python/GafferSceneUI/RenderPassEditor.py

@@ -452,7 +452,10 @@ def __setActiveRenderPass( self, pathListing ) :
 		else :
 			renderPassPlug = script["variables"]["renderPass"]
 
-		renderPassPlug["value"].setValue( selectedPassNames[0] )
+		with Gaffer.Context( self.getContext() ) :
+			currentRenderPass = renderPassPlug["value"].getValue()
+
+		renderPassPlug["value"].setValue( selectedPassNames[0] if selectedPassNames[0] != currentRenderPass else "" )
 
 	## \todo Consider consolidating this with `LightEditor.__editSelectedCells()`.
 	# The main difference being the name of the context variable that is set before inspection,

src/GafferSceneUIModule/RenderPassEditorBinding.cpp

@@ -527,7 +527,7 @@ class RenderPassActiveColumn : public PathColumn
 					iconData->writable()["state:normal"] = g_activeRenderPassIcon;
 					/// \todo This is only to allow sorting, replace with `CellData::sortValue` in Gaffer 1.4
 					result.value = new StringData( " " );
-					result.toolTip = new StringData( fmt::format( "{} is the currently active render pass.", renderPassName->readable() ) );
+					result.toolTip = new StringData( fmt::format( "{} is the currently active render pass.\n\nDouble-click to unset.", renderPassName->readable() ) );
 
 					return result;
 				}