Fix inconsistent behavior of Bezier editor undo operations upon selection of different animation #93860
Conversation
CookieBadger
force-pushed
the
animation-bezier-undo-on-different-animation-fix
branch
from
9b914b1 to
8c473ac
Compare
CookieBadger
force-pushed
the
animation-bezier-undo-on-different-animation-fix
branch
from
8c473ac to
163d218
Compare
scene/resources/animation.h
Outdated
| @@ -455,6 +455,7 @@ class Animation : public Resource { | |||
| void track_set_interpolation_type(int p_track, InterpolationType p_interp); | |||
| InterpolationType track_get_interpolation_type(int p_track) const; | |||
|
|
|||
| void bezier_track_insert_key_with_handle_mode(int p_track, double p_time, real_t p_value, const Vector2 &p_in_handle, const Vector2 &p_out_handle, HandleMode p_handle_mode); | |||
There was a problem hiding this comment.
HandleMode is TOOLS_ENABLED (editor) only, so this doesn't compile in export templates.
If this is only needed for the editor, it should also be enclosed in #ifdef TOOLS_ENABLED, but then it can't be exposed in _bind_methods as the scripting API shouldn't differ between tools and non-tools.
There was a problem hiding this comment.
oh I see. Well, it should not be exposed in the scripting API, but I figured it would have to be bound, such that it can be called from a signal, right?
There was a problem hiding this comment.
To use as a signal callback it doesn't need to be bound, you can use callable_mp.
But in this PR you're using it for UndoRedo and that one currently still requires method bindings, it doesn't support callable_mp.
So ideally if there's a way to achieve what you're doing while keeping the method within the AnimationBezierEditor, that might be best. Otherwise it might need some creative API rethinking (possibly exposing HandleMode to non-tools if there's no good alternative).
There was a problem hiding this comment.
Ok, makes sense. The easiest is to move it back to the bezier editor then. Thank you, akien! :)
CookieBadger
force-pushed
the
animation-bezier-undo-on-different-animation-fix
branch
from
163d218 to
af26e7b
Compare
|
Thanks! |
Fixes #93859.
This PR removes the method_bezier_track_insert_keyin theAnimationBezierEditorand adds a methodbezier_track_insert_key_with_handle_modeinAnimation. This new method is then called in the undo/redo operations, such that the correct animation is always tracked.This PR adds the animation as a parameter to a method
_bezier_track_insert_key_at_anim(before_bezier_track_insert_key) in theAnimationBezierEditor, such that it is tracked when used in UndoRedo operations.