diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-13 08:01:14 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-13 08:01:14 -0300 |
| commit | 451b1d91446f6e15763b4d6ec3bd6d74c2be8080 (patch) | |
| tree | d74ed733e5f64fb3888107e118f4db41e3740bb5 /tools/editor | |
| parent | 450926693f0f18a40a7b60d64eef800f1a18a28a (diff) | |
| parent | cdf07327bc1e0c1acded9327e2447d258d8ad2fd (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_node.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/script_editor_debugger.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/script_editor_debugger.h | 1 | ||||
| -rw-r--r-- | tools/editor/spatial_editor_gizmos.cpp | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 35404b0bba..3dbca760f0 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1816,7 +1816,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) { } play_button->set_pressed(false); - play_button->set_icon(gui_base->get_icon("Play","EditorIcons")); + play_button->set_icon(gui_base->get_icon("MainPlay","EditorIcons")); //pause_button->set_pressed(false); play_scene_button->set_pressed(false); play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons")); @@ -2688,7 +2688,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { editor_run.stop(); play_button->set_pressed(false); - play_button->set_icon(gui_base->get_icon("Play","EditorIcons")); + play_button->set_icon(gui_base->get_icon("MainPlay","EditorIcons")); play_scene_button->set_pressed(false); play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons")); //pause_button->set_pressed(false); diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index 1247760a55..d0bf4faf02 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -570,8 +570,7 @@ void ScriptEditorDebugger::_notification(int p_what) { ppeer->set_stream_peer(connection); - if (!always_visible) - show(); + show(); dobreak->set_disabled(false); tabs->set_current_tab(0); @@ -1460,7 +1459,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ add_child(msgdialog); hide(); - always_visible=false; log_forced_visible=false; p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this); diff --git a/tools/editor/script_editor_debugger.h b/tools/editor/script_editor_debugger.h index 906714d13c..43666b37d5 100644 --- a/tools/editor/script_editor_debugger.h +++ b/tools/editor/script_editor_debugger.h @@ -81,7 +81,6 @@ class ScriptEditorDebugger : public Control { TabContainer *tabs; Label *reason; - bool always_visible; bool log_forced_visible; ScriptEditorDebuggerVariables *variables; diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp index 5efca44c7d..04a6b1b437 100644 --- a/tools/editor/spatial_editor_gizmos.cpp +++ b/tools/editor/spatial_editor_gizmos.cpp @@ -2283,6 +2283,8 @@ void NavigationMeshSpatialGizmo::redraw() { } } + if (faces.empty()) + return; Map<_EdgeKey,bool> edge_map; DVector<Vector3> tmeshfaces; @@ -2330,7 +2332,7 @@ void NavigationMeshSpatialGizmo::redraw() { } } - Ref<TriangleMesh> tmesh = memnew( TriangleMesh); + Ref<TriangleMesh> tmesh = memnew( TriangleMesh ); tmesh->create(tmeshfaces); if (lines.size()) |