FIX : Last round of fixes

Changes.md

@@ -1,6 +1,11 @@
 1.4.x.x (relative to 1.4.3.0)
 =======
 
+Features
+--------
+
+- ShaderTweaks : Added support for creating ShaderTweakProxy nodes that allow making input connections to the original network.
+
 Improvements
 ------------
 

python/GafferArnoldUI/ArnoldShaderUI.py

@@ -46,7 +46,6 @@
 import imath
 
 import Gaffer
-import GafferScene
 import GafferUI
 import GafferImageUI
 import GafferSceneUI

python/GafferOSLUI/OSLShaderUI.py

@@ -40,7 +40,6 @@
 
 import Gaffer
 import GafferUI
-import GafferScene
 
 import GafferOSL
 

python/GafferSceneTest/ShaderTweakProxyTest.py

@@ -113,6 +113,12 @@ def test( self ) :
 		self.assertEqual( tweakedNetwork.input( ( "texture2", "c" ) ), ( "tweakShader", "out" ) )
 		self.assertEqual( tweakedNetwork.input( ( "tweakShader", "c" ) ), ( "", "" ) )
 
+		# Test using an auto-proxy on a parameter with no input ( it should apply the value to what the
+		# auto-proxy is connected to )
+		textureShader2["parameters"]["c"].setValue( imath.Color3f( 5, 6, 7 ) )
+		tweaks["tweaks"][0]["name"].setValue( "texture2.c" )
+		tweakedNetwork = tweaks["out"].attributes( "/plane" )["surface"]
+		self.assertEqual( tweakedNetwork.getShader( "tweakShader" ).parameters["c"].value, imath.Color3f( 5, 6, 7 ) )
 
 		# Test proxying a specific node using a named handle
 		tweaks["tweaks"][0]["name"].setValue( "c" )
@@ -129,6 +135,7 @@ def test( self ) :
 		self.assertEqual( tweakedNetwork.input( ( "surface", "c" ) ), ( "tweakShader", "out" ) )
 		self.assertEqual( tweakedNetwork.input( ( "tweakShader", "c" ) ), ( "texture2", "out" ) )
 
+		# Test error if we try to make a cycle
 		tweaks["tweaks"][0]["name"].setValue( "texture2.c" )
 		specificProxy["parameters"]["targetShader"].setValue( "texture1" )
 

python/GafferSceneUI/ShaderTweakProxyUI.py

@@ -86,7 +86,6 @@
 			The handle of the upstream shader being fetched by this proxy - or Auto, indicating that
 			the original input of the parameter being ShaderTweaked will be used.
 			""",
-			"label", "Source Node",
 			"readOnly", True,
 			"nodule:type", "",
 			"stringPlugValueWidget:placeholderText", "Auto",
@@ -164,6 +163,8 @@ def __createShaderTweakProxy( plug, sourceHandle, sourceType, sourceName ):
 		result["parameters"]["targetShader"].setValue( sourceHandle )
 
 		plug.node().parent().addChild( result )
+		plug.node().scriptNode().selection().clear()
+		plug.node().scriptNode().selection().add( result )
 
 		# See if there are any output plugs on the new proxy which can be connected to this plug
 		for p in result["out"].children():

src/GafferScene/ShaderAssignment.cpp

@@ -37,8 +37,6 @@
 
 #include "GafferScene/ShaderAssignment.h"
 
-#include "GafferScene/ShaderTweakProxy.h"
-
 #include "Gaffer/Metadata.h"
 
 #include "IECoreScene/ShaderNetwork.h"

src/GafferScene/ShaderTweaks.cpp

@@ -449,7 +449,6 @@ bool ShaderTweaks::applyTweaks( IECoreScene::ShaderNetwork *shaderNetwork, Tweak
 					// are nodes in the two networks with the same name, which get uniquified during addShaders.
 					// This could be solved with an optional output unordered_map<oldHandle, newHandle>
 					// from addShaders(). For the moment, however, Doing this after merging simplifies all that.
-					std::vector<IECore::InternedString> shadersToDelete;
 
 					// If we need to check for cycles, we will need to populate a set of dependent shaders.
 					// We cache it in case there are multiple proxies connected to the same tweak.
@@ -462,8 +461,6 @@ bool ShaderTweaks::applyTweaks( IECoreScene::ShaderNetwork *shaderNetwork, Tweak
 							continue;
 						}
 
-						shadersToDelete.push_back( i.first );
-
 						ShaderNetwork::ConnectionRange range = shaderNetwork->outputConnections( i.first );
 						const std::vector<ShaderNetwork::Connection> outputConnections( range.begin(), range.end() );
 
@@ -501,8 +498,8 @@ bool ShaderTweaks::applyTweaks( IECoreScene::ShaderNetwork *shaderNetwork, Tweak
 										modifiedShader.first->second = proxyConnectedShader->copy();
 									}
 
-									const IECore::Data *origDestParameter = modifiedShader.first->second->parameters().at(c.destination.name).get();
-									modifiedShader.first->second->parameters()[c.destination.name] = castDataToType( shader->parameters().at(parameter.name).get(), origDestParameter );
+									const IECore::Data *origDestParameter = modifiedShader.first->second->parametersData()->member(c.destination.name, /* throwExceptions = */ true );
+									modifiedShader.first->second->parameters()[c.destination.name] = castDataToType( shader->parametersData()->member( parameter.name, /* throwExceptions = */ true ), origDestParameter );
 								}
 							}
 							else