diff options
| author | Juan Linietsky | 2016-01-23 19:51:51 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-01-23 19:51:51 -0300 |
| commit | 6c27df8df609337867c108c5adb66174393e190b (patch) | |
| tree | 11c1e8ad5f1f844fe6af2032784fd8e2a2951420 /tools/editor/plugins | |
| parent | a2992d5955ff4f84f829dcab4859b4f5b5399a2c (diff) | |
| download | godot-6c27df8df609337867c108c5adb66174393e190b.tar.gz godot-6c27df8df609337867c108c5adb66174393e190b.tar.zst godot-6c27df8df609337867c108c5adb66174393e190b.zip | |
-Fixes a bunch of stdout errors, closes #2763 closes #2731
Diffstat (limited to 'tools/editor/plugins')
| -rw-r--r-- | tools/editor/plugins/animation_player_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/shader_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/sprite_region_editor_plugin.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index b56140b32..43b4276d4 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -93,7 +93,7 @@ void AnimationPlayerEditor::_notification(int p_what) { if (p_what==NOTIFICATION_ENTER_TREE) { - editor->connect("hide_animation_player_editors",this,"_hide_anim_editors"); +// editor->connect("hide_animation_player_editors",this,"_hide_anim_editors"); add_anim->set_icon( get_icon("New","EditorIcons") ); rename_anim->set_icon( get_icon("Rename","EditorIcons") ); duplicate_anim->set_icon( get_icon("Duplicate","EditorIcons") ); diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index 65b5365b5..18d8f5efc 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -234,7 +234,7 @@ void ShaderEditor::_tab_changed(int p_which) { ShaderTextEditor *shader_editor = tab_container->get_tab_control(p_which)->cast_to<ShaderTextEditor>(); - if (shader_editor) + if (shader_editor && is_inside_tree()) shader_editor->get_text_edit()->grab_focus(); ensure_select_current(); diff --git a/tools/editor/plugins/sprite_region_editor_plugin.cpp b/tools/editor/plugins/sprite_region_editor_plugin.cpp index 725de19dd..8dfa8a60a 100644 --- a/tools/editor/plugins/sprite_region_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_region_editor_plugin.cpp @@ -367,7 +367,7 @@ void SpriteRegionEditor::edit(Node *p_sprite) { if (p_sprite) { node=p_sprite->cast_to<Sprite>(); - node->connect("exit_tree",this,"_node_removed",varray(),CONNECT_ONESHOT); + node->connect("exit_tree",this,"_node_removed",varray(p_sprite),CONNECT_ONESHOT); } else { if (node) node->disconnect("exit_tree",this,"_node_removed"); |