From d68d36dac31fd65cae0e0e6725fd7cb6e9f9e51d Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 17 Jan 2016 20:10:24 -0300 Subject: fixes to keying updating --- tools/editor/animation_editor.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index fa89039c82..8c21a1f6bf 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -2807,6 +2807,10 @@ void AnimationKeyEditor::_notification(int p_what) { switch(p_what) { + case NOTIFICATION_VISIBILITY_CHANGED: { + + EditorNode::get_singleton()->update_keying(); + } break; case NOTIFICATION_ENTER_TREE: { @@ -2989,6 +2993,8 @@ void AnimationKeyEditor::set_animation(const Ref& p_anim) { _update_menu(); selected_track=-1; _edit_if_single_selection(); + + EditorNode::get_singleton()->update_keying(); } void AnimationKeyEditor::set_root(Node *p_root) { @@ -3024,7 +3030,7 @@ void AnimationKeyEditor::set_keying(bool p_enabled) { bool AnimationKeyEditor::has_keying() const { - return is_visible(); + return is_visible() && animation.is_valid(); } void AnimationKeyEditor::_query_insert(const InsertData& p_id) { -- cgit v1.2.3