NodeMenu/NodeEditor : Scope a valid context for evaling user defaults

GafferHQ · Jan 3, 2024 · edb395b · edb395b
1 parent 1c9c3e3
commit edb395b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -44,6 +44,8 @@ Fixes
   - Stopped failed jobs jumping to the end of the Local Jobs UI.
   - Fixed message log update.
   - Fixed `Job.statistics()` errors on Windows, ensuring that a `pid` is always returned when available.
+- NodeMenu/NodeEditor : `userDefault` metadata is now evaluated in the script context, so it can depend on script variables.
+
 
 API
 ---

diff --git a/python/GafferUI/NodeEditor.py b/python/GafferUI/NodeEditor.py
@@ -233,7 +233,8 @@ def applyDefaults( graphComponent ) :
 		node = self.nodeUI().node()
 		with Gaffer.UndoScope( node.ancestor( Gaffer.ScriptNode ) ) :
 			applyDefaults( node )
-			Gaffer.NodeAlgo.applyUserDefaults( node )
+			with node.ancestor( Gaffer.ScriptNode ).context():
+				Gaffer.NodeAlgo.applyUserDefaults( node )
 
 	def __applyReadOnly( self, readOnly ) :
 

diff --git a/python/GafferUI/NodeMenu.py b/python/GafferUI/NodeMenu.py
@@ -116,7 +116,8 @@ def f( menu ) :
 				if node is None :
 					return
 
-				Gaffer.NodeAlgo.applyUserDefaults( node )
+				with script.context():
+					Gaffer.NodeAlgo.applyUserDefaults( node )
 
 				for plugName, plugValue in plugValues.items() :
 					node.descendant( plugName ).setValue( plugValue )