Skip to content

Commit

Permalink
Inspector : Fix references to "None" rather than "Source"
Browse files Browse the repository at this point in the history
  • Loading branch information
johnhaddon committed Dec 10, 2024
1 parent bf8d404 commit 41d12cf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Fixes
- Widget : Fixed `event.sourceWidget` for DragDropEvents generated from a Qt native drag within the same Gaffer process. This will now reference the `GafferUI.Widget` that the Qt source widget belongs to, if any.
- Catalogue : Fixed bug which "stole" drags that crossed the image listing but which were destined elsewhere, for instance a drag from the HierarchyView to a PathFilter in the GraphEditor.
- GadgetWidget : Fixed signal handling bug in `setViewportGadget()`. This could cause the widget to attempt to redraw unnecessarily when the _old_ viewport requested a redraw.
- AttributeEditor, LightEditor, RenderPassEditor : Fixed warning message which referred to "None" rather than the "Source" scope.

API
---
Expand Down
2 changes: 1 addition & 1 deletion python/GafferSceneUITest/ParameterInspectorTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ def testDisableEdit( self ) :

inspection = self.__inspect( s["editScope"]["out"], "/light", "exposure", s["editScope"] )
self.assertFalse( inspection.canDisableEdit() )
self.assertEqual( inspection.nonDisableableReason(), "Edit is not in the current edit scope. Change scope to None to disable." )
self.assertEqual( inspection.nonDisableableReason(), "Edit is not in the current edit scope. Change scope to Source to disable." )

inspection = self.__inspect( s["editScope"]["out"], "/light", "exposure", None )
self.assertEqual( inspection.source(), s["light"]["parameters"]["exposure"] )
Expand Down
4 changes: 2 additions & 2 deletions src/GafferSceneUI/Inspector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void Inspector::inspectHistoryWalk( const GafferScene::SceneAlgo::History *histo
if( !result->m_editScope && node->ancestor<EditScope>() )
{
// We don't allow editing if the user hasn't requested a specific scope
// (they have selected "None" from the Menu) and the upstream edit is
// (they have selected "Source" from the Menu) and the upstream edit is
// inside _any_ EditScope.
result->m_editFunction = fmt::format(
"Source is in an EditScope. Change scope to {} to edit.",
Expand Down Expand Up @@ -328,7 +328,7 @@ void Inspector::inspectHistoryWalk( const GafferScene::SceneAlgo::History *histo
}
else if( !node->ancestor<EditScope>() && result->m_editScope )
{
result->m_disableEditFunction = "Edit is not in the current edit scope. Change scope to None to disable.";
result->m_disableEditFunction = "Edit is not in the current edit scope. Change scope to Source to disable.";
}
}
}
Expand Down

0 comments on commit 41d12cf

Please sign in to comment.