diff --git a/Changes.md b/Changes.md index 1795a6b7483..97476aaeba5 100644 --- a/Changes.md +++ b/Changes.md @@ -6,6 +6,7 @@ Features - Render, InteractiveRender : Added new nodes capable of rendering to any supported renderer, and using the`render:defaultRenderer` option to determine which to use by default. - StandardOptions : Added `render:defaultRenderer` option, allowing the scene globals to specify which renderer is used by the Render and InteractiveRender nodes. +- RenderPassEditor : Added a column for the `render:defaultRenderer` option, allowing each pass to be rendered in a different renderer. 1.3.13.1 (relative to 1.3.13.0) ======== diff --git a/startup/GafferScene/standardOptions.py b/startup/GafferScene/standardOptions.py index 8665a18c416..b9acb555fdc 100644 --- a/startup/GafferScene/standardOptions.py +++ b/startup/GafferScene/standardOptions.py @@ -110,6 +110,17 @@ """ ) +Gaffer.Metadata.registerValue( "option:render:defaultRenderer", "label", "Renderer" ) +Gaffer.Metadata.registerValue( "option:render:defaultRenderer", "defaultValue", "" ) +Gaffer.Metadata.registerValue( + "option:render:defaultRenderer", + "description", + """ + Specifies the default renderer to be used by the Render and + InteractiveRender nodes. + """ +) + Gaffer.Metadata.registerValue( "option:render:inclusions", "label", "Inclusions" ) Gaffer.Metadata.registerValue( "option:render:inclusions", "defaultValue", IECore.StringData( "/" ) ) Gaffer.Metadata.registerValue( diff --git a/startup/gui/renderPassEditor.py b/startup/gui/renderPassEditor.py index 3fc28293af4..ef91f11fbff 100644 --- a/startup/gui/renderPassEditor.py +++ b/startup/gui/renderPassEditor.py @@ -45,6 +45,7 @@ GafferSceneUI.RenderPassEditor.registerOption( "*", "render:exclusions" ) GafferSceneUI.RenderPassEditor.registerOption( "*", "render:additionalLights" ) +GafferSceneUI.RenderPassEditor.registerOption( "*", "render:defaultRenderer", "Render" ) GafferSceneUI.RenderPassEditor.registerOption( "*", "render:camera", "Render" ) GafferSceneUI.RenderPassEditor.registerOption( "*", "render:resolution", "Render" ) GafferSceneUI.RenderPassEditor.registerOption( "*", "render:resolutionMultiplier", "Render" )