Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EditScopeUI : Fix bug handling read-only ScriptNodes #6185

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,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.
- EditScope : Fixed error updating the Global Edit Target in read-only files.

API
---
Expand Down
6 changes: 4 additions & 2 deletions python/GafferUI/EditScopeUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,11 @@ def __unusableReason( self, editScope ) :

def __readOnlyReason( self, editScope ) :

if Gaffer.MetadataAlgo.readOnly( editScope ) :
readOnlyReason = Gaffer.MetadataAlgo.readOnlyReason( editScope )
if readOnlyReason is not None :
return "{} is locked.".format(
Gaffer.MetadataAlgo.readOnlyReason( editScope ).relativeName( editScope.scriptNode() )
"File" if isinstance( readOnlyReason, Gaffer.ScriptNode )
else readOnlyReason.relativeName( readOnlyReason.scriptNode() )
)

return None
Expand Down