Browse Source

Cleans up headers included in editor_node.h

Haoyu Qiu 5 years ago
parent
commit
078c0d75f2
72 changed files with 180 additions and 49 deletions
  1. 1 0
      editor/connections_dialog.cpp
  2. 2 0
      editor/create_dialog.cpp
  3. 1 0
      editor/dependency_editor.cpp
  4. 1 0
      editor/editor_asset_installer.cpp
  5. 1 0
      editor/editor_audio_buses.cpp
  6. 2 0
      editor/editor_autoload_settings.cpp
  7. 1 0
      editor/editor_help.cpp
  8. 1 0
      editor/editor_help_search.cpp
  9. 1 0
      editor/editor_inspector.cpp
  10. 1 0
      editor/editor_log.cpp
  11. 38 0
      editor/editor_node.cpp
  12. 41 48
      editor/editor_node.h
  13. 3 0
      editor/editor_plugin.cpp
  14. 1 0
      editor/editor_plugin_settings.cpp
  15. 2 0
      editor/editor_properties.cpp
  16. 1 0
      editor/editor_settings.cpp
  17. 2 0
      editor/export_template_manager.cpp
  18. 4 0
      editor/filesystem_dock.cpp
  19. 1 0
      editor/groups_editor.cpp
  20. 1 0
      editor/import_dock.cpp
  21. 1 0
      editor/node_dock.cpp
  22. 2 0
      editor/plugin_config_dialog.cpp
  23. 1 0
      editor/plugins/abstract_polygon_2d_editor.cpp
  24. 1 0
      editor/plugins/animation_blend_space_1d_editor.cpp
  25. 1 0
      editor/plugins/animation_blend_space_2d_editor.cpp
  26. 2 0
      editor/plugins/animation_blend_tree_editor_plugin.cpp
  27. 2 0
      editor/plugins/animation_blend_tree_editor_plugin.h
  28. 1 0
      editor/plugins/animation_player_editor_plugin.cpp
  29. 1 0
      editor/plugins/animation_state_machine_editor.cpp
  30. 2 0
      editor/plugins/asset_library_editor_plugin.cpp
  31. 1 0
      editor/plugins/audio_stream_editor_plugin.cpp
  32. 2 0
      editor/plugins/canvas_item_editor_plugin.cpp
  33. 1 0
      editor/plugins/curve_editor_plugin.cpp
  34. 1 0
      editor/plugins/curve_editor_plugin.h
  35. 1 0
      editor/plugins/editor_preview_plugins.cpp
  36. 1 0
      editor/plugins/gradient_editor_plugin.cpp
  37. 1 0
      editor/plugins/item_list_editor_plugin.cpp
  38. 2 0
      editor/plugins/material_editor_plugin.cpp
  39. 2 0
      editor/plugins/material_editor_plugin.h
  40. 2 0
      editor/plugins/mesh_editor_plugin.cpp
  41. 1 0
      editor/plugins/mesh_editor_plugin.h
  42. 1 0
      editor/plugins/mesh_instance_editor_plugin.cpp
  43. 1 0
      editor/plugins/path_2d_editor_plugin.cpp
  44. 1 0
      editor/plugins/polygon_2d_editor_plugin.cpp
  45. 3 0
      editor/plugins/script_editor_plugin.cpp
  46. 1 0
      editor/plugins/script_text_editor.cpp
  47. 2 0
      editor/plugins/spatial_editor_plugin.cpp
  48. 1 0
      editor/plugins/spatial_editor_plugin.h
  49. 1 0
      editor/plugins/sprite_editor_plugin.cpp
  50. 2 0
      editor/plugins/sprite_frames_editor_plugin.cpp
  51. 2 0
      editor/plugins/style_box_editor_plugin.cpp
  52. 1 0
      editor/plugins/texture_region_editor_plugin.cpp
  53. 2 0
      editor/plugins/theme_editor_plugin.cpp
  54. 1 0
      editor/plugins/tile_set_editor_plugin.cpp
  55. 1 0
      editor/plugins/version_control_editor_plugin.cpp
  56. 2 0
      editor/plugins/visual_shader_editor_plugin.cpp
  57. 1 0
      editor/project_export.cpp
  58. 2 0
      editor/project_settings_editor.cpp
  59. 2 0
      editor/property_editor.cpp
  60. 2 0
      editor/scene_tree_dock.cpp
  61. 2 1
      editor/scene_tree_editor.cpp
  62. 2 0
      editor/script_editor_debugger.cpp
  63. 2 0
      editor/settings_config_dialog.cpp
  64. 1 0
      main/main.cpp
  65. 2 0
      modules/gdnative/gdnative_library_editor_plugin.cpp
  66. 1 0
      modules/gdnative/register_types.cpp
  67. 1 0
      modules/gdscript/language_server/gdscript_language_server.cpp
  68. 1 0
      modules/mono/csharp_script.cpp
  69. 1 0
      modules/mono/editor/editor_internal_calls.cpp
  70. 1 0
      modules/visual_script/visual_script_editor.cpp
  71. 1 0
      platform/android/export/export.cpp
  72. 1 0
      scene/gui/dialogs.cpp

+ 1 - 0
editor/connections_dialog.cpp

@@ -32,6 +32,7 @@
 
 #include "core/print_string.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 #include "plugins/script_editor_plugin.h"
 #include "scene/gui/label.h"

+ 2 - 0
editor/create_dialog.cpp

@@ -33,8 +33,10 @@
 #include "core/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/print_string.h"
+#include "editor_feature_profile.h"
 #include "editor_help.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/gui/box_container.h"
 

+ 1 - 0
editor/dependency_editor.cpp

@@ -33,6 +33,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "scene/gui/margin_container.h"
 
 void DependencyEditor::_searched(const String &p_path) {

+ 1 - 0
editor/editor_asset_installer.cpp

@@ -34,6 +34,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "editor_node.h"
+#include "progress_dialog.h"
 
 void EditorAssetInstaller::_update_subitems(TreeItem *p_item, bool p_check, bool p_first) {
 

+ 1 - 0
editor/editor_audio_buses.cpp

@@ -34,6 +34,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "filesystem_dock.h"
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"

+ 2 - 0
editor/editor_autoload_settings.cpp

@@ -33,6 +33,8 @@
 #include "core/global_constants.h"
 #include "core/project_settings.h"
 #include "editor_node.h"
+#include "editor_scale.h"
+#include "project_settings_editor.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
 

+ 1 - 0
editor/editor_help.cpp

@@ -35,6 +35,7 @@
 #include "doc_data_compressed.gen.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 
 #define CONTRIBUTE_URL "https://docs.godotengine.org/en/latest/community/contributing/updating_the_class_reference.html"

+ 1 - 0
editor/editor_help_search.cpp

@@ -31,6 +31,7 @@
 #include "editor_help_search.h"
 
 #include "core/os/keyboard.h"
+#include "editor_feature_profile.h"
 #include "editor_node.h"
 
 void EditorHelpSearch::_update_icons() {

+ 1 - 0
editor/editor_inspector.cpp

@@ -31,6 +31,7 @@
 #include "editor_inspector.h"
 #include "array_property_edit.h"
 #include "dictionary_property_edit.h"
+#include "editor_feature_profile.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "multi_node_edit.h"

+ 1 - 0
editor/editor_log.cpp

@@ -33,6 +33,7 @@
 #include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "scene/gui/center_container.h"
 #include "scene/resources/dynamic_font.h"
 

+ 38 - 0
editor/editor_node.cpp

@@ -49,16 +49,44 @@
 #include "core/version.h"
 #include "main/input_default.h"
 #include "main/main.h"
+#include "scene/gui/center_container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/file_dialog.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/panel.h"
+#include "scene/gui/panel_container.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/tabs.h"
+#include "scene/gui/texture_progress.h"
+#include "scene/gui/tool_button.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/physics_2d_server.h"
 
+#include "editor/audio_stream_preview.h"
+#include "editor/dependency_editor.h"
+#include "editor/editor_about.h"
 #include "editor/editor_audio_buses.h"
+#include "editor/editor_export.h"
+#include "editor/editor_feature_profile.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_help.h"
+#include "editor/editor_inspector.h"
+#include "editor/editor_layouts_dialog.h"
+#include "editor/editor_log.h"
+#include "editor/editor_plugin.h"
 #include "editor/editor_properties.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_run_native.h"
+#include "editor/editor_run_script.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_spin_slider.h"
 #include "editor/editor_themes.h"
+#include "editor/export_template_manager.h"
+#include "editor/fileserver/editor_file_server.h"
+#include "editor/filesystem_dock.h"
 #include "editor/import/editor_import_collada.h"
 #include "editor/import/editor_scene_importer_gltf.h"
 #include "editor/import/resource_importer_bitmask.h"
@@ -71,7 +99,11 @@
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_texture_atlas.h"
 #include "editor/import/resource_importer_wav.h"
+#include "editor/import_dock.h"
 #include "editor/multi_node_edit.h"
+#include "editor/node_dock.h"
+#include "editor/pane_drag.h"
+#include "editor/plugin_config_dialog.h"
 #include "editor/plugins/animation_blend_space_1d_editor.h"
 #include "editor/plugins/animation_blend_space_2d_editor.h"
 #include "editor/plugins/animation_blend_tree_editor_plugin.h"
@@ -128,9 +160,15 @@
 #include "editor/plugins/tile_set_editor_plugin.h"
 #include "editor/plugins/version_control_editor_plugin.h"
 #include "editor/plugins/visual_shader_editor_plugin.h"
+#include "editor/progress_dialog.h"
+#include "editor/project_export.h"
+#include "editor/project_settings_editor.h"
 #include "editor/pvrtc_compress.h"
+#include "editor/quick_open.h"
 #include "editor/register_exporters.h"
+#include "editor/run_settings_dialog.h"
 #include "editor/script_editor_debugger.h"
+#include "editor/settings_config_dialog.h"
 
 #include <stdio.h>
 

+ 41 - 48
editor/editor_node.h

@@ -31,66 +31,59 @@
 #ifndef EDITOR_NODE_H
 #define EDITOR_NODE_H
 
-#include "core/print_string.h"
-#include "editor/audio_stream_preview.h"
-#include "editor/connections_dialog.h"
-#include "editor/create_dialog.h"
-#include "editor/editor_about.h"
 #include "editor/editor_data.h"
-#include "editor/editor_export.h"
-#include "editor/editor_feature_profile.h"
 #include "editor/editor_folding.h"
-#include "editor/editor_inspector.h"
-#include "editor/editor_layouts_dialog.h"
-#include "editor/editor_log.h"
-#include "editor/editor_plugin.h"
-#include "editor/editor_resource_preview.h"
 #include "editor/editor_run.h"
-#include "editor/editor_run_native.h"
-#include "editor/editor_run_script.h"
-#include "editor/editor_scale.h"
-#include "editor/editor_sub_scene.h"
-#include "editor/export_template_manager.h"
-#include "editor/fileserver/editor_file_server.h"
-#include "editor/filesystem_dock.h"
-#include "editor/groups_editor.h"
-#include "editor/import_dock.h"
 #include "editor/inspector_dock.h"
-#include "editor/node_dock.h"
-#include "editor/pane_drag.h"
-#include "editor/plugin_config_dialog.h"
-#include "editor/progress_dialog.h"
-#include "editor/project_export.h"
-#include "editor/project_settings_editor.h"
 #include "editor/property_editor.h"
-#include "editor/quick_open.h"
-#include "editor/reparent_dialog.h"
-#include "editor/run_settings_dialog.h"
 #include "editor/scene_tree_dock.h"
-#include "editor/scene_tree_editor.h"
-#include "editor/script_create_dialog.h"
-#include "editor/settings_config_dialog.h"
-#include "scene/gui/center_container.h"
-#include "scene/gui/control.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/panel.h"
-#include "scene/gui/panel_container.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/tabs.h"
-#include "scene/gui/texture_progress.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/tree.h"
-#include "scene/gui/viewport_container.h"
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();
 typedef bool (*EditorBuildCallback)();
 
+class AcceptDialog;
+class AudioStreamPreviewGenerator;
+class BackgroundProgress;
+class CenterContainer;
+class ConfirmationDialog;
+class Control;
+class DependencyEditor;
+class DependencyErrorDialog;
+class EditorAbout;
+class EditorExport;
+class EditorFeatureProfileManager;
+class EditorFileServer;
+class EditorInspector;
+class EditorLayoutsDialog;
+class EditorLog;
+class EditorPlugin;
 class EditorPluginList;
+class EditorQuickOpen;
+class EditorResourcePreview;
+class EditorRunNative;
+class EditorSettingsDialog;
+class ExportTemplateManager;
+class FileSystemDock;
+class HSplitContainer;
+class ImportDock;
+class MenuButton;
+class NodeDock;
+class OrphanResourcesDialog;
+class PaneDrag;
+class Panel;
+class PanelContainer;
+class PluginConfigDialog;
+class ProgressDialog;
+class ProjectExportDialog;
+class ProjectSettingsEditor;
+class RunSettingsDialog;
+class ScriptCreateDialog;
+class TabContainer;
+class Tabs;
+class TextureProgress;
+class ToolButton;
+class VSplitContainer;
 
 class EditorNode : public Node {
 

+ 3 - 0
editor/editor_plugin.cpp

@@ -30,8 +30,11 @@
 
 #include "editor_plugin.h"
 
+#include "editor/editor_export.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "editor/filesystem_dock.h"
+#include "editor/project_settings_editor.h"
 #include "editor_resource_preview.h"
 #include "main/main.h"
 #include "plugins/canvas_item_editor_plugin.h"

+ 1 - 0
editor/editor_plugin_settings.cpp

@@ -35,6 +35,7 @@
 #include "core/os/main_loop.h"
 #include "core/project_settings.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "scene/gui/margin_container.h"
 
 void EditorPluginSettings::_notification(int p_what) {

+ 2 - 0
editor/editor_properties.cpp

@@ -31,8 +31,10 @@
 #include "editor_properties.h"
 
 #include "editor/editor_resource_preview.h"
+#include "editor/filesystem_dock.h"
 #include "editor_node.h"
 #include "editor_properties_array_dict.h"
+#include "editor_scale.h"
 #include "scene/main/viewport.h"
 
 ///////////////////// NULL /////////////////////////

+ 1 - 0
editor/editor_settings.cpp

@@ -34,6 +34,7 @@
 #include "core/io/compression.h"
 #include "core/io/config_file.h"
 #include "core/io/file_access_memory.h"
+#include "core/io/ip.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/io/translation_loader_po.h"

+ 2 - 0
editor/export_template_manager.cpp

@@ -38,6 +38,8 @@
 #include "core/version.h"
 #include "editor_node.h"
 #include "editor_scale.h"
+#include "progress_dialog.h"
+#include "scene/gui/link_button.h"
 
 void ExportTemplateManager::_update_template_list() {
 

+ 4 - 0
editor/filesystem_dock.cpp

@@ -36,8 +36,12 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
+#include "editor_feature_profile.h"
 #include "editor_node.h"
+#include "editor_resource_preview.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
+#include "import_dock.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
 

+ 1 - 0
editor/groups_editor.cpp

@@ -31,6 +31,7 @@
 #include "groups_editor.h"
 #include "editor/scene_tree_editor.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/resources/packed_scene.h"

+ 1 - 0
editor/import_dock.cpp

@@ -30,6 +30,7 @@
 
 #include "import_dock.h"
 #include "editor_node.h"
+#include "editor_resource_preview.h"
 
 class ImportDockParameters : public Object {
 	GDCLASS(ImportDockParameters, Object);

+ 1 - 0
editor/node_dock.cpp

@@ -31,6 +31,7 @@
 #include "node_dock.h"
 
 #include "editor_node.h"
+#include "editor_scale.h"
 
 void NodeDock::show_groups() {
 

+ 2 - 0
editor/plugin_config_dialog.cpp

@@ -33,6 +33,8 @@
 #include "core/os/dir_access.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
+#include "editor/editor_scale.h"
+#include "editor/project_settings_editor.h"
 #include "modules/gdscript/gdscript.h"
 #include "scene/gui/grid_container.h"
 

+ 1 - 0
editor/plugins/abstract_polygon_2d_editor.cpp

@@ -32,6 +32,7 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 
 AbstractPolygon2DEditor::Vertex::Vertex() :
 		polygon(-1),

+ 1 - 0
editor/plugins/animation_blend_space_1d_editor.cpp

@@ -31,6 +31,7 @@
 #include "animation_blend_space_1d_editor.h"
 
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 
 StringName AnimationNodeBlendSpace1DEditor::get_blend_position_path() const {

+ 1 - 0
editor/plugins/animation_blend_space_2d_editor.cpp

@@ -35,6 +35,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
+#include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"

+ 2 - 0
editor/plugins/animation_blend_tree_editor_plugin.cpp

@@ -35,9 +35,11 @@
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor/editor_inspector.h"
+#include "editor/editor_scale.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
+#include "scene/gui/progress_bar.h"
 #include "scene/main/viewport.h"
 
 void AnimationNodeBlendTreeEditor::add_custom_type(const String &p_name, const Ref<Script> &p_script) {

+ 2 - 0
editor/plugins/animation_blend_tree_editor_plugin.h

@@ -41,6 +41,8 @@
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
+class ProgressBar;
+
 class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 
 	GDCLASS(AnimationNodeBlendTreeEditor, AnimationTreeNodeEditorPlugin);

+ 1 - 0
editor/plugins/animation_player_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor/animation_track_editor.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 
 // For onion skinning.

+ 1 - 0
editor/plugins/animation_state_machine_editor.cpp

@@ -35,6 +35,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
+#include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"

+ 2 - 0
editor/plugins/asset_library_editor_plugin.cpp

@@ -33,7 +33,9 @@
 #include "core/io/json.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/project_settings_editor.h"
 
 void EditorAssetLibraryItem::configure(const String &p_title, int p_asset_id, const String &p_category, int p_category_id, const String &p_author, int p_author_id, const String &p_cost) {
 

+ 1 - 0
editor/plugins/audio_stream_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/project_settings.h"
+#include "editor/audio_stream_preview.h"
 #include "editor/editor_settings.h"
 
 void AudioStreamEditor::_notification(int p_what) {

+ 2 - 0
editor/plugins/canvas_item_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "core/print_string.h"
 #include "core/project_settings.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
@@ -47,6 +48,7 @@
 #include "scene/2d/touch_screen_button.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/nine_patch_rect.h"
+#include "scene/gui/viewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"

+ 1 - 0
editor/plugins/curve_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "core/core_string_names.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 
 CurveEditor::CurveEditor() {
 	_selected_point = -1;

+ 1 - 0
editor/plugins/curve_editor_plugin.h

@@ -33,6 +33,7 @@
 
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
+#include "editor/editor_resource_preview.h"
 #include "scene/resources/curve.h"
 
 // Edits a y(x) curve

+ 1 - 0
editor/plugins/editor_preview_plugins.cpp

@@ -40,6 +40,7 @@
 #include "scene/resources/dynamic_font.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
+#include "servers/audio/audio_stream.h"
 
 void post_process_preview(Ref<Image> p_image) {
 

+ 1 - 0
editor/plugins/gradient_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "gradient_editor_plugin.h"
 
 #include "canvas_item_editor_plugin.h"
+#include "editor/editor_scale.h"
 #include "spatial_editor_plugin.h"
 
 Size2 GradientEditor::get_minimum_size() const {

+ 1 - 0
editor/plugins/item_list_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "item_list_editor_plugin.h"
 
 #include "core/io/resource_loader.h"
+#include "editor/editor_scale.h"
 
 bool ItemListPlugin::_set(const StringName &p_name, const Variant &p_value) {
 

+ 2 - 0
editor/plugins/material_editor_plugin.cpp

@@ -30,6 +30,8 @@
 
 #include "material_editor_plugin.h"
 
+#include "editor/editor_scale.h"
+#include "scene/gui/viewport_container.h"
 #include "scene/resources/particles_material.h"
 
 void MaterialEditor::_notification(int p_what) {

+ 2 - 0
editor/plugins/material_editor_plugin.h

@@ -41,6 +41,8 @@
 #include "scene/3d/mesh_instance.h"
 #include "scene/resources/material.h"
 
+class ViewportContainer;
+
 class MaterialEditor : public Control {
 
 	GDCLASS(MaterialEditor, Control);

+ 2 - 0
editor/plugins/mesh_editor_plugin.cpp

@@ -30,6 +30,8 @@
 
 #include "mesh_editor_plugin.h"
 
+#include "editor/editor_scale.h"
+
 void MeshEditor::_gui_input(Ref<InputEvent> p_event) {
 
 	Ref<InputEventMouseMotion> mm = p_event;

+ 1 - 0
editor/plugins/mesh_editor_plugin.h

@@ -36,6 +36,7 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
+#include "scene/gui/viewport_container.h"
 #include "scene/resources/material.h"
 
 class MeshEditor : public ViewportContainer {

+ 1 - 0
editor/plugins/mesh_instance_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "mesh_instance_editor_plugin.h"
 
+#include "editor/editor_scale.h"
 #include "scene/3d/collision_shape.h"
 #include "scene/3d/navigation_mesh.h"
 #include "scene/3d/physics_body.h"

+ 1 - 0
editor/plugins/path_2d_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "canvas_item_editor_plugin.h"
 #include "core/os/file_access.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 
 void Path2DEditor::_notification(int p_what) {

+ 1 - 0
editor/plugins/polygon_2d_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "core/os/file_access.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "scene/2d/skeleton_2d.h"
 

+ 3 - 0
editor/plugins/script_editor_plugin.cpp

@@ -37,7 +37,10 @@
 #include "core/os/os.h"
 #include "core/project_settings.h"
 #include "editor/editor_node.h"
+#include "editor/editor_run_script.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/filesystem_dock.h"
 #include "editor/find_in_files.h"
 #include "editor/node_dock.h"
 #include "editor/plugins/shader_editor_plugin.h"

+ 1 - 0
editor/plugins/script_text_editor.cpp

@@ -33,6 +33,7 @@
 #include "core/math/expression.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/script_editor_debugger.h"
 

+ 2 - 0
editor/plugins/spatial_editor_plugin.cpp

@@ -37,6 +37,7 @@
 #include "core/project_settings.h"
 #include "core/sort_array.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
@@ -47,6 +48,7 @@
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/physics_body.h"
 #include "scene/3d/visual_instance.h"
+#include "scene/gui/viewport_container.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/surface_tool.h"
 

+ 1 - 0
editor/plugins/spatial_editor_plugin.h

@@ -41,6 +41,7 @@
 class Camera;
 class SpatialEditor;
 class EditorSpatialGizmoPlugin;
+class ViewportContainer;
 
 class EditorSpatialGizmo : public SpatialGizmo {
 

+ 1 - 0
editor/plugins/sprite_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "sprite_editor_plugin.h"
 
 #include "canvas_item_editor_plugin.h"
+#include "editor/editor_scale.h"
 #include "scene/2d/collision_polygon_2d.h"
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/2d/mesh_instance_2d.h"

+ 2 - 0
editor/plugins/sprite_frames_editor_plugin.cpp

@@ -32,8 +32,10 @@
 
 #include "core/io/resource_loader.h"
 #include "core/project_settings.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "scene/3d/sprite_3d.h"
+#include "scene/gui/center_container.h"
 
 void SpriteFramesEditor::_gui_input(Ref<InputEvent> p_event) {
 }

+ 2 - 0
editor/plugins/style_box_editor_plugin.cpp

@@ -30,6 +30,8 @@
 
 #include "style_box_editor_plugin.h"
 
+#include "editor/editor_scale.h"
+
 bool EditorInspectorPluginStyleBox::can_handle(Object *p_object) {
 
 	return Object::cast_to<StyleBox>(p_object) != NULL;

+ 1 - 0
editor/plugins/texture_region_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "core/core_string_names.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/check_box.h"
 
 /**

+ 2 - 0
editor/plugins/theme_editor_plugin.cpp

@@ -32,6 +32,8 @@
 
 #include "core/os/file_access.h"
 #include "core/version.h"
+#include "editor/editor_scale.h"
+#include "scene/gui/progress_bar.h"
 
 void ThemeEditor::edit(const Ref<Theme> &p_theme) {
 

+ 1 - 0
editor/plugins/tile_set_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_scale.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/physics_body_2d.h"
 #include "scene/2d/sprite.h"

+ 1 - 0
editor/plugins/version_control_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "core/script_language.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 VersionControlEditorPlugin *VersionControlEditorPlugin::singleton = NULL;
 

+ 2 - 0
editor/plugins/visual_shader_editor_plugin.cpp

@@ -35,7 +35,9 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
+#include "editor/editor_log.h"
 #include "editor/editor_properties.h"
+#include "editor/editor_scale.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"

+ 1 - 0
editor/project_export.cpp

@@ -40,6 +40,7 @@
 #include "core/project_settings.h"
 #include "editor_data.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/margin_container.h"

+ 2 - 0
editor/project_settings_editor.cpp

@@ -35,7 +35,9 @@
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "core/translation.h"
+#include "editor/editor_export.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/tab_container.h"
 

+ 2 - 0
editor/property_editor.cpp

@@ -47,7 +47,9 @@
 #include "editor/editor_file_system.h"
 #include "editor/editor_help.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/filesystem_dock.h"
 #include "editor/multi_node_edit.h"
 #include "editor/property_selector.h"
 #include "scene/gui/label.h"

+ 2 - 0
editor/scene_tree_dock.cpp

@@ -35,7 +35,9 @@
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 
+#include "editor/editor_feature_profile.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/multi_node_edit.h"
 #include "editor/plugins/animation_player_editor_plugin.h"

+ 2 - 1
editor/scene_tree_editor.cpp

@@ -32,9 +32,10 @@
 
 #include "core/message_queue.h"
 #include "core/print_string.h"
+#include "editor/editor_node.h"
+#include "editor/node_dock.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
-#include "editor_node.h"
 #include "scene/gui/label.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"

+ 2 - 0
editor/script_editor_debugger.cpp

@@ -35,9 +35,11 @@
 #include "core/ustring.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/spatial_editor_plugin.h"
+#include "editor_log.h"
 #include "editor_network_profiler.h"
 #include "editor_node.h"
 #include "editor_profiler.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 #include "main/performance.h"
 #include "property_editor.h"

+ 2 - 0
editor/settings_config_dialog.cpp

@@ -33,7 +33,9 @@
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor_file_system.h"
+#include "editor_log.h"
 #include "editor_node.h"
+#include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/gui/margin_container.h"
 #include "script_editor_debugger.h"

+ 1 - 0
main/main.cpp

@@ -75,6 +75,7 @@
 #include "editor/doc/doc_data_class_path.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "editor/progress_dialog.h"
 #include "editor/project_manager.h"
 #endif
 

+ 2 - 0
modules/gdnative/gdnative_library_editor_plugin.cpp

@@ -32,6 +32,8 @@
 #include "gdnative_library_editor_plugin.h"
 #include "gdnative.h"
 
+#include "editor/editor_scale.h"
+
 void GDNativeLibraryEditor::edit(Ref<GDNativeLibrary> p_library) {
 	library = p_library;
 	Ref<ConfigFile> config = p_library->get_config_file();

+ 1 - 0
modules/gdnative/register_types.cpp

@@ -47,6 +47,7 @@
 #include "core/project_settings.h"
 
 #ifdef TOOLS_ENABLED
+#include "editor/editor_export.h"
 #include "editor/editor_node.h"
 #include "gdnative_library_editor_plugin.h"
 #include "gdnative_library_singleton_editor.h"

+ 1 - 0
modules/gdscript/language_server/gdscript_language_server.cpp

@@ -31,6 +31,7 @@
 #include "gdscript_language_server.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
+#include "editor/editor_log.h"
 #include "editor/editor_node.h"
 
 GDScriptLanguageServer::GDScriptLanguageServer() {

+ 1 - 0
modules/mono/csharp_script.cpp

@@ -42,6 +42,7 @@
 #include "editor/bindings_generator.h"
 #include "editor/csharp_project.h"
 #include "editor/editor_node.h"
+#include "editor/node_dock.h"
 #endif
 
 #ifdef DEBUG_METHODS_ENABLED

+ 1 - 0
modules/mono/editor/editor_internal_calls.cpp

@@ -37,6 +37,7 @@
 #include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/script_editor_debugger.h"
 #include "main/main.h"

+ 1 - 0
modules/visual_script/visual_script_editor.cpp

@@ -37,6 +37,7 @@
 #include "core/variant.h"
 #include "editor/editor_node.h"
 #include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
 #include "scene/main/viewport.h"
 #include "visual_script_expression.h"
 #include "visual_script_flow_control.h"

+ 1 - 0
platform/android/export/export.cpp

@@ -38,6 +38,7 @@
 #include "core/project_settings.h"
 #include "core/version.h"
 #include "editor/editor_export.h"
+#include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "platform/android/logo.gen.h"

+ 1 - 0
scene/gui/dialogs.cpp

@@ -35,6 +35,7 @@
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/main/viewport.h" // Only used to check for more modals when dimming the editor.
 #endif