Merge pull request #1462 from johnhaddon/shaderSwitchUIFix

ShaderSwitch NodeGraph UI Fix
GafferHQ · Aug 27, 2015 · b86f331 · b86f331
2 parents e05b220 + 16a8d6a
commit b86f331
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/python/GafferSceneUI/GroupUI.py b/python/GafferSceneUI/GroupUI.py
@@ -56,12 +56,6 @@
 
 	plugs = {
 
-		"in*" : [
-
-			"plugValueWidget:type", "",
-
-		],
-
 		"name" : [
 
 			"description",

diff --git a/python/GafferSceneUI/SceneProcessorUI.py b/python/GafferSceneUI/SceneProcessorUI.py
@@ -54,6 +54,7 @@
 		"in" : [
 
 			"description", lambda plug : "The input scene" + ( "s" if isinstance( plug, Gaffer.ArrayPlug ) else "" ),
+			"plugValueWidget:type", "",
 			"nodule:type", lambda plug : "GafferUI::CompoundNodule" if isinstance( plug, Gaffer.ArrayPlug ) else "GafferUI::StandardNodule",
 			"compoundNodule:spacing", 2.0,
 

diff --git a/python/GafferSceneUI/SceneSwitchUI.py b/python/GafferSceneUI/SceneSwitchUI.py
@@ -50,12 +50,6 @@
 
 	plugs = {
 
-		"in*" : [
-
-			"plugValueWidget:type", "",
-
-		],
-
 		"index" : [
 
 			"description",

diff --git a/python/GafferSceneUI/ShaderSwitchUI.py b/python/GafferSceneUI/ShaderSwitchUI.py
@@ -54,21 +54,20 @@
 
 	plugs = {
 
-		"in*" : [
-
-			"nodeGadget:nodulePosition", "left",
-			"plugValueWidget:type", "",
-
-		],
-
 		"in" : [
 
 			"description",
 			"""
-			The first input shader - the one passed through when
-			the index is 0.
+			The input shaders - the index plug decides
+			which of these is passed through to the output.
 			""",
 
+			"plugValueWidget:type", "",
+			"nodule:type", "GafferUI::CompoundNodule",
+			"nodeGadget:nodulePosition", "left",
+			"compoundNodule:orientation", "y",
+			"compoundNodule:spacing", 0.2,
+
 		],
 
 		"out" : [