diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 | ||||
| -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 |
6 files changed, 14 insertions, 11 deletions
@@ -23,3 +23,5 @@ http://www.godotengine.org Compilation instructions for every platform can be found in the Wiki: http://godotengine.org/projects/godot-engine/wiki/Advanced_topics + +[](https://travis-ci.org/godotengine/godot) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 2dffa332ee..3b25701944 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1730,6 +1730,8 @@ void Tree::_text_editor_modal_close() { return; } + if (value_editor->has_point(value_editor->get_local_mouse_pos())) + return; text_editor_enter(text_editor->get_text()); } 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() { |