asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3485 from TheHX/issue-3465

Browse source 
Fix animation toolbar
This commit is contained in:
Rémi Verschelde 2016-01-27 17:29:55 +01:00
commit 9e2736b984
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/editor/animation_editor.cpp
View file

@ -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) {

2
tools/editor/animation_editor.h
View file

@ -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();

1
tools/editor/editor_node.cpp
View file

@ -3661,6 +3661,7 @@ void EditorNode::update_keying() {
property_editor->set_keying(valid);
AnimationPlayerEditor::singleton->get_key_editor()->update_keying();
}

7
tools/editor/plugins/animation_player_editor_plugin.cpp
View file

@ -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() {