diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-27 17:29:55 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-27 17:29:55 +0100 |
| commit | 9e2736b98491141c4e9da7f134a54c77dbbd313e (patch) | |
| tree | b01d86664e2dd4aea184d62591939a6b9de61ca8 | |
| parent | 928156652c77a7669ab6ea3f5d2de3a24e91620e (diff) | |
| parent | 9f5d537993c81d98f8c5848279f9ce89661bfc85 (diff) | |
Merge pull request #3485 from TheHX/issue-3465
Fix animation toolbar
| -rw-r--r-- | tools/editor/animation_editor.cpp | 11 | ||||
| -rw-r--r-- | tools/editor/animation_editor.h | 2 | ||||
| -rw-r--r-- | tools/editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/animation_player_editor_plugin.cpp | 7 |
4 files changed, 10 insertions, 11 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index cdce910665..a247543830 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3022,9 +3022,14 @@ Node *AnimationKeyEditor::get_root() const { -void AnimationKeyEditor::set_keying(bool p_enabled) { +void AnimationKeyEditor::update_keying() { - keying=p_enabled; + bool keying_enabled=is_visible() && animation.is_valid(); + + if (keying_enabled==keying) + return; + + keying=keying_enabled; _update_menu(); emit_signal("keying_changed"); @@ -3032,7 +3037,7 @@ void AnimationKeyEditor::set_keying(bool p_enabled) { bool AnimationKeyEditor::has_keying() const { - return is_visible() && animation.is_valid(); + return keying; } void AnimationKeyEditor::_query_insert(const InsertData& p_id) { diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h index c8a539179e..5e81439fe6 100644 --- a/tools/editor/animation_editor.h +++ b/tools/editor/animation_editor.h @@ -324,7 +324,7 @@ public: Ref<Animation> get_current_animation() const; void set_root(Node *p_root); Node *get_root() const; - void set_keying(bool p_enabled); + void update_keying(); bool has_keying() const; void cleanup(); diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 39e848201a..1abcb8f604 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -3661,6 +3661,7 @@ void EditorNode::update_keying() { property_editor->set_keying(valid); + AnimationPlayerEditor::singleton->get_key_editor()->update_keying(); } diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 43b4276d45..0e2977c5a1 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -128,16 +128,9 @@ void AnimationPlayerEditor::_notification(int p_what) { anim_editor_load->set_hover_texture( get_icon("AnimGetHl","EditorIcons")); anim_editor_store->set_hover_texture( get_icon("AnimSetHl","EditorIcons")); */ - } - - if (p_what==NOTIFICATION_READY) { get_tree()->connect("node_removed",this,"_node_removed"); } - - if (p_what==NOTIFICATION_DRAW) { - - } } void AnimationPlayerEditor::_autoplay_pressed() { |