godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually fix animation editor's bottom panel button not being pressed on certain occasions

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias 2019-05-27 12:12:51 -03:00
parent eb70999ffa
commit 560f5cb104
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -703,7 +703,7 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
if (Object::cast_to<AnimationPlayer>(n) && EditorNode::get_singleton()->get_editor_selection()->is_selected(n)) {
player = Object::cast_to<AnimationPlayer>(n);
_update_player();
show();
editor->make_bottom_panel_item_visible(this);
set_process(true);
ensure_visibility();
@ -1874,8 +1874,6 @@ void AnimationPlayerEditorPlugin::edit(Object *p_object) {
if (!p_object)
return;
anim_editor->edit(Object::cast_to<AnimationPlayer>(p_object));
// In case switching to a scene with an AnimationPlayer selected but with the animation editor closed.
button->set_pressed(true);
}
bool AnimationPlayerEditorPlugin::handles(Object *p_object) const {
@ -1898,7 +1896,7 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) {
editor = p_node;
anim_editor = memnew(AnimationPlayerEditor(editor, this));
anim_editor->set_undo_redo(editor->get_undo_redo());
button = editor->add_bottom_panel_item(TTR("Animation"), anim_editor);
editor->add_bottom_panel_item(TTR("Animation"), anim_editor);
}
AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() {

1
editor/plugins/animation_player_editor_plugin.h
View File

@ -257,7 +257,6 @@ class AnimationPlayerEditorPlugin : public EditorPlugin {
AnimationPlayerEditor *anim_editor;
EditorNode *editor;
Button *button;
protected:
void _notification(int p_what);