Skip to content

Commit

Permalink
Merge pull request #6134 from johnhaddon/animationEditorFix
Browse files Browse the repository at this point in the history
AnimationEditor : Fix changing of frame by click & drag
  • Loading branch information
johnhaddon authored Nov 12, 2024
2 parents f48e544 + 5bc6a61 commit 3756a50
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Fixes
- OpDialogue : Fixed `postExecuteBehaviour` handling.
- LocalDispatcher : Fixed job status update when a job was killed _immediately_ after being launched.
- `gaffer view` : Fixed default OpenColorIO display transform.
- AnimationEditor : Fixed changing of the current frame by dragging the frame indicator or clicking on the time axis.

API
---
Expand Down
9 changes: 8 additions & 1 deletion python/GafferUI/AnimationEditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,14 @@ def _updateFromSet( self ) :

def _updateFromContext( self, modifiedItems ) :

self.__animationGadget.setContext( self.context() )
# Note that we're passing `scriptNode().context()` rather than
# `self.context()` because we don't want to use a ContextTracker-based
# context in the AnimationEditor.
## \todo It would be better if `AnimationGadget::setContext()` connected
# to `Context::changedSignal()` and updated automatically after that. We
# could also consider removing `setContext()` entirely and connecting to
# the ScriptNode's context in the AnimationGadget constructor.
self.__animationGadget.setContext( self.scriptNode().context() )

def __updateGadgetSets( self, unused = None ) :

Expand Down

0 comments on commit 3756a50

Please sign in to comment.