1 files changed, 4 insertions, 10 deletions
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 47058839ba..29ce4f189e 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -76,7 +76,6 @@ class AnimationTimelineEdit : public Range {
 	Rect2 hsize_rect;
 
 	bool editing;
-	bool *block_animation_update_ptr; //used to block all tracks re-gen (speed up)
 
 	bool panning_timeline;
 	float panning_timeline_from;
@@ -104,7 +103,6 @@ public:
 	void set_zoom(Range *p_zoom);
 	Range *get_zoom() const { return zoom; }
 	void set_undo_redo(UndoRedo *p_undo_redo);
-	void set_block_animation_update_ptr(bool *p_block_ptr);
 
 	void set_play_position(float p_pos);
 	float get_play_position() const;
@@ -143,6 +141,7 @@ class AnimationTrackEdit : public Control {
 	Node *root;
 	Control *play_position; //separate control used to draw so updates for only position changed are much faster
 	float play_position_pos;
+	NodePath node_path;
 
 	Ref<Animation> animation;
 	int track;
@@ -170,8 +169,6 @@ class AnimationTrackEdit : public Control {
 
 	void _menu_selected(int p_index);
 
-	bool *block_animation_update_ptr; //used to block all tracks re-gen (speed up)
-
 	void _path_entered(const String &p_text);
 	void _play_position_draw();
 	mutable int dropping_at;
@@ -216,8 +213,7 @@ public:
 	AnimationTimelineEdit *get_timeline() const { return timeline; }
 	AnimationTrackEditor *get_editor() const { return editor; }
 	UndoRedo *get_undo_redo() const { return undo_redo; }
-	bool *get_block_animation_update_ptr() { return block_animation_update_ptr; }
-
+	NodePath get_path() const;
 	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
 	virtual Size2 get_minimum_size() const;
 
@@ -226,8 +222,6 @@ public:
 	void set_editor(AnimationTrackEditor *p_editor);
 	void set_root(Node *p_root);
 
-	void set_block_animation_update_ptr(bool *p_block_ptr);
-
 	void set_play_position(float p_pos);
 	void update_play_position();
 	void cancel_drop();
@@ -313,8 +307,8 @@ class AnimationTrackEditor : public VBoxContainer {
 	Vector<AnimationTrackEdit *> track_edits;
 	Vector<AnimationTrackEditGroup *> groups;
 
-	bool block_animation_update;
-
+	bool animation_changing_awaiting_update;
+	void _animation_update();
 	int _get_track_selected();
 	void _animation_changed();
 	void _update_tracks();