godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

-Fixes a bunch of stdout errors, closes #2763 closes #2731

Browse Source
This commit is contained in:
Juan Linietsky
2016-01-23 19:51:51 -03:00
parent a2992d5955
commit 6c27df8df6
9 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/animation_editor.cpp
View File

@@ -2814,6 +2814,8 @@ void AnimationKeyEditor::_notification(int p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
key_editor->edit(key_edit);
zoomicon->set_texture( get_icon("Zoom","EditorIcons") ); zoomicon->set_texture( get_icon("Zoom","EditorIcons") );
menu_add_track->set_icon(get_icon("AddTrack","EditorIcons")); menu_add_track->set_icon(get_icon("AddTrack","EditorIcons"));
@@ -3924,7 +3926,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
key_edit = memnew( AnimationKeyEdit ); key_edit = memnew( AnimationKeyEdit );
key_edit->undo_redo=undo_redo; key_edit->undo_redo=undo_redo;
//key_edit->ke_dialog=key_edit_dialog; //key_edit->ke_dialog=key_edit_dialog;
key_editor->edit(key_edit);
type_menu = memnew( PopupMenu ); type_menu = memnew( PopupMenu );
add_child(type_menu); add_child(type_menu);
for(int i=0;i<Variant::VARIANT_MAX;i++) for(int i=0;i<Variant::VARIANT_MAX;i++)

5
tools/editor/connections_dialog.cpp
View File

@@ -97,6 +97,10 @@ void ConnectDialog::_notification(int p_what) {
RID ci = get_canvas_item(); RID ci = get_canvas_item();
get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size())); get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));
} }
if (p_what==NOTIFICATION_ENTER_TREE) {
bind_editor->edit(cdbinds);
}
} }
void ConnectDialog::_tree_node_selected() { void ConnectDialog::_tree_node_selected() {
@@ -456,7 +460,6 @@ ConnectDialog::ConnectDialog() {
set_as_toplevel(true); set_as_toplevel(true);
cdbinds = memnew( ConnectDialogBinds ); cdbinds = memnew( ConnectDialogBinds );
bind_editor->edit(cdbinds);
error = memnew( ConfirmationDialog ); error = memnew( ConfirmationDialog );
add_child(error); add_child(error);

8
tools/editor/editor_node.cpp
View File

@@ -4533,14 +4533,14 @@ void EditorNode::_scene_tab_changed(int p_tab) {
editor_data.get_undo_redo().create_action("Switch Scene Tab"); editor_data.get_undo_redo().create_action("Switch Scene Tab");
editor_data.get_undo_redo().add_do_method(this,"set_current_version",unsaved?saved_version:0); editor_data.get_undo_redo().add_do_method(this,"set_current_version",unsaved?saved_version:0);
editor_data.get_undo_redo().add_do_method(this,"set_current_scene",p_tab); editor_data.get_undo_redo().add_do_method(this,"set_current_scene",p_tab);
editor_data.get_undo_redo().add_do_method(scene_tabs,"set_current_tab",p_tab); //editor_data.get_undo_redo().add_do_method(scene_tabs,"set_current_tab",p_tab);
editor_data.get_undo_redo().add_do_method(scene_tabs,"ensure_tab_visible",p_tab); //editor_data.get_undo_redo().add_do_method(scene_tabs,"ensure_tab_visible",p_tab);
editor_data.get_undo_redo().add_do_method(this,"set_current_version",next_scene_version==0?editor_data.get_undo_redo().get_version()+1:next_scene_version); editor_data.get_undo_redo().add_do_method(this,"set_current_version",next_scene_version==0?editor_data.get_undo_redo().get_version()+1:next_scene_version);
editor_data.get_undo_redo().add_undo_method(this,"set_current_version",next_scene_version); editor_data.get_undo_redo().add_undo_method(this,"set_current_version",next_scene_version);
editor_data.get_undo_redo().add_undo_method(this,"set_current_scene",editor_data.get_edited_scene()); editor_data.get_undo_redo().add_undo_method(this,"set_current_scene",editor_data.get_edited_scene());
editor_data.get_undo_redo().add_undo_method(scene_tabs,"set_current_tab",editor_data.get_edited_scene()); //editor_data.get_undo_redo().add_undo_method(scene_tabs,"set_current_tab",editor_data.get_edited_scene());
editor_data.get_undo_redo().add_undo_method(scene_tabs,"ensure_tab_visible",p_tab,editor_data.get_edited_scene()); //editor_data.get_undo_redo().add_undo_method(scene_tabs,"ensure_tab_visible",p_tab,editor_data.get_edited_scene());
editor_data.get_undo_redo().add_undo_method(this,"set_current_version",saved_version); editor_data.get_undo_redo().add_undo_method(this,"set_current_version",saved_version);
editor_data.get_undo_redo().commit_action(); editor_data.get_undo_redo().commit_action();

2
tools/editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -93,7 +93,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) { 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") ); add_anim->set_icon( get_icon("New","EditorIcons") );
rename_anim->set_icon( get_icon("Rename","EditorIcons") ); rename_anim->set_icon( get_icon("Rename","EditorIcons") );
duplicate_anim->set_icon( get_icon("Duplicate","EditorIcons") ); duplicate_anim->set_icon( get_icon("Duplicate","EditorIcons") );

2
tools/editor/plugins/shader_editor_plugin.cpp
View File

@@ -234,7 +234,7 @@ void ShaderEditor::_tab_changed(int p_which) {
ShaderTextEditor *shader_editor = tab_container->get_tab_control(p_which)->cast_to<ShaderTextEditor>(); 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(); shader_editor->get_text_edit()->grab_focus();
ensure_select_current(); ensure_select_current();

2
tools/editor/plugins/sprite_region_editor_plugin.cpp
View File

@@ -367,7 +367,7 @@ void SpriteRegionEditor::edit(Node *p_sprite)
{ {
if (p_sprite) { if (p_sprite) {
node=p_sprite->cast_to<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 { } else {
if (node) if (node)
node->disconnect("exit_tree",this,"_node_removed"); node->disconnect("exit_tree",this,"_node_removed");

2
tools/editor/property_editor.cpp
View File

@@ -3908,7 +3908,7 @@ SectionedPropertyEditor::SectionedPropertyEditor() {
right_vb->add_margin_child("Properties:",editor,true); right_vb->add_margin_child("Properties:",editor,true);
editor->get_scene_tree()->set_column_titles_visible(false); editor->get_scene_tree()->set_column_titles_visible(false);
add_child(editor);
editor->hide_top_label(); editor->hide_top_label();

3
tools/editor/scene_tree_editor.cpp
View File

@@ -721,6 +721,9 @@ void SceneTreeEditor::_update_selection(TreeItem *item) {
NodePath np = item->get_metadata(0); NodePath np = item->get_metadata(0);
if (!has_node(np))
return;
Node *n=get_node(np); Node *n=get_node(np);
if (!n) if (!n)

4
tools/editor/script_editor_debugger.cpp
View File

@@ -530,6 +530,8 @@ void ScriptEditorDebugger::_notification(int p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
inspector->edit(variables);
step->set_icon( get_icon("DebugStep","EditorIcons")); step->set_icon( get_icon("DebugStep","EditorIcons"));
next->set_icon( get_icon("DebugNext","EditorIcons")); next->set_icon( get_icon("DebugNext","EditorIcons"));
back->set_icon( get_icon("Back","EditorIcons")); back->set_icon( get_icon("Back","EditorIcons"));
@@ -1308,7 +1310,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
pending_in_queue=0; pending_in_queue=0;
variables = memnew( ScriptEditorDebuggerVariables ); variables = memnew( ScriptEditorDebuggerVariables );
inspector->edit(variables);
breaked=false; breaked=false;
tabs->add_child(dbg); tabs->add_child(dbg);