Merge pull request #5645 from danieldresser-ie/arnoldAOVFixes

Arnold Minor Aov Fixes

Changes.md

@@ -9,7 +9,10 @@ Features
 Improvements
 ------------
 
-- ArnoldShader : Added a colour space presets menu for the `image` shader.
+- Arnold :
+  - ArnoldShader : Added a colour space presets menu for the `image` shader.
+  - Added specific warning for outputs with space in name.
+  - Added normal and depth AOVs.
 - CyclesShader : Added a colour space presets menu for the `image_texture` and `environment_texture` shaders (#5618).
 
 Fixes

src/IECoreArnold/Renderer.cpp

@@ -473,6 +473,10 @@ class ArnoldOutput : public IECore::RefCounted
 		ArnoldOutput( AtUniverse *universe, const IECore::InternedString &name, const IECoreScene::Output *output, NodeDeleter nodeDeleter )
 			:	m_universe( universe ), m_name( name ), m_nodeDeleter( nodeDeleter )
 		{
+			if( m_name.string().find( " " ) != std::string::npos )
+			{
+				throw IECore::Exception( fmt::format( "Unable to create output driver with name \"{}\", Arnold does not allow spaces in output names.", m_name.string() ) );
+			}
 			update( output );
 		}
 

startup/gui/outputs.py

@@ -116,10 +116,19 @@
 		"volume_indirect",
 		"volume_albedo",
 		"motionvector",
+		"normal",
+		"depth",
 	] :
 
 		label = aov.replace( "_", " " ).title().replace( " ", "_" )
-		data = "color " + aov if aov != "beauty" else "rgba"
+		if aov == "beauty":
+			data = "rgba"
+		elif aov == "depth":
+			data = "float Z"
+		elif aov == "normal":
+			data = "color N"
+		else:
+			data = "color " + aov
 
 		if aov == "motionvector" :
 			parameters = {
@@ -128,6 +137,9 @@
 		else :
 			parameters = {}
 
+		if aov == "depth":
+			parameters["layerName"] = "Z"
+
 		if aov not in { "motionvector", "emission", "background" } :
 			parameters["layerPerLightGroup"] = False