Merge pull request #6225 from johnhaddon/linkedLightsFallback

Attribute metadata : Fix default value for `linkedLights`
GafferHQ · Jan 21, 2025 · a16474e · a16474e
2 parents 8524c13 + d3f2e0a
commit a16474e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Changes.md b/Changes.md
@@ -4,6 +4,7 @@
 Fixes
 -----
 
+- AttributeEditor : Fixed display of fallback value for `linkedLights` attribute.
 - AttributeEditor, LightEditor, RenderPassEditor :
   - Fixed bugs which prevented edits being made in "Source" scope when there was a downstream edit in an EditScope (#6172).
   - Fixed warning messages when attempting to disable a non-existent edit.

diff --git a/src/GafferScene/StandardAttributes.cpp b/src/GafferScene/StandardAttributes.cpp
@@ -65,6 +65,7 @@ StandardAttributes::StandardAttributes( const std::string &name )
 
 	// light linking
 
+	/// \todo The default value is wrong - it should be "defaultLights".
 	attributes->addChild( new Gaffer::NameValuePlug( "linkedLights", new IECore::StringData( "" ), false, "linkedLights" ) );
 
 	// light filter linking

diff --git a/startup/GafferScene/standardAttributes.py b/startup/GafferScene/standardAttributes.py
@@ -142,7 +142,7 @@
 )
 
 Gaffer.Metadata.registerValue( "attribute:linkedLights", "label", "Linked Lights" )
-Gaffer.Metadata.registerValue( "attribute:linkedLights", "defaultValue", IECore.StringData( "" ) )
+Gaffer.Metadata.registerValue( "attribute:linkedLights", "defaultValue", "defaultLights" )
 Gaffer.Metadata.registerValue(
 	"attribute:linkedLights",
 	"description",