diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2020-02-24 06:21:15 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2020-03-08 12:16:09 +0100 |
| commit | 540ca05a80e23daafa191cdf24c07b3f8e37b47a (patch) | |
| tree | aa4fda23fcc0d8e4ce5bef10df0a7f7ae4ca04ea /editor/plugins | |
| parent | 74051c77dc3ec1548f8efedfd892a0b2ad3537ad (diff) | |
Threaded networking for editor debugger.
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 6 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 1 | ||||
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index af7f8cf5d6..4bfe633494 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -3992,7 +3992,7 @@ void CanvasItemEditor::_notification(int p_what) { if (!is_visible() && override_camera_button->is_pressed()) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); override_camera_button->set_pressed(false); } } @@ -4348,9 +4348,9 @@ void CanvasItemEditor::_button_override_camera(bool p_pressed) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); if (p_pressed) { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_2D); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_2D); } else { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); } } diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 60bed10351..bb03cad285 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -37,7 +37,6 @@ #include "core/os/os.h" #include "core/project_settings.h" #include "editor/debugger/editor_debugger_node.h" -#include "editor/debugger/script_editor_debugger.h" #include "editor/editor_node.h" #include "editor/editor_run_script.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 0bbcbb0080..85863d8c29 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -4487,12 +4487,12 @@ void SpatialEditor::_menu_item_toggled(bool pressed, int p_option) { case MENU_TOOL_OVERRIDE_CAMERA: { EditorDebuggerNode *const debugger = EditorDebuggerNode::get_singleton(); + using Override = EditorDebuggerNode::CameraOverride; if (pressed) { - using Override = ScriptEditorDebugger::CameraOverride; debugger->set_camera_override((Override)(Override::OVERRIDE_3D_1 + camera_override_viewport_id)); } else { - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(Override::OVERRIDE_NONE); } } break; @@ -4545,8 +4545,8 @@ void SpatialEditor::_update_camera_override_viewport(Object *p_viewport) { EditorDebuggerNode *const debugger = EditorDebuggerNode::get_singleton(); camera_override_viewport_id = current_viewport->index; - if (debugger->get_camera_override() >= ScriptEditorDebugger::OVERRIDE_3D_1) { - using Override = ScriptEditorDebugger::CameraOverride; + if (debugger->get_camera_override() >= EditorDebuggerNode::OVERRIDE_3D_1) { + using Override = EditorDebuggerNode::CameraOverride; debugger->set_camera_override((Override)(Override::OVERRIDE_3D_1 + camera_override_viewport_id)); } @@ -5503,7 +5503,7 @@ void SpatialEditor::_notification(int p_what) { if (!is_visible() && tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->is_pressed()) { EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton(); - debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE); + debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE); tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->set_pressed(false); } } |