Remove sky.h include from environment.h, to speed up compile time.

editor/animation/animation_library_editor.cpp

@@ -30,6 +30,7 @@
 
 #include "animation_library_editor.h"
 
+#include "core/io/resource_loader.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"

editor/animation/animation_player_editor_plugin.h

@@ -40,6 +40,7 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_button.h"
 #include "scene/gui/tree.h"
+#include "scene/resources/material.h"
 
 class AnimationPlayerEditorPlugin;
 class ImageTexture;

editor/debugger/editor_debugger_inspector.cpp

@@ -32,6 +32,7 @@
 
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
+#include "core/io/resource_loader.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"

editor/debugger/editor_debugger_node.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_debugger_node.h"
 
+#include "core/io/resource_loader.h"
 #include "core/object/undo_redo.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_debugger_tree.h"

editor/debugger/editor_debugger_tree.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_debugger_tree.h"
 
+#include "core/io/resource_saver.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"

editor/editor_log.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_log.h"
 
+#include "core/io/resource_loader.h"
 #include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
 #include "core/version.h"

editor/gui/create_dialog.cpp

@@ -30,6 +30,7 @@
 
 #include "create_dialog.h"
 
+#include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/import/3d/scene_import_settings.cpp

@@ -45,6 +45,7 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/timer.h"
 #include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/sky.h"
 #include "scene/resources/surface_tool.h"
 
 class SceneImportSettingsData : public Object {

editor/inspector/editor_properties.cpp

@@ -59,6 +59,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
+#include "scene/resources/sky.h"
 #include "scene/resources/visual_shader_nodes.h"
 
 ///////////////////// NIL /////////////////////////

editor/scene/3d/node_3d_editor_plugin.cpp

@@ -104,6 +104,7 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/resources/3d/sky_material.h"
 #include "scene/resources/packed_scene.h"
+#include "scene/resources/sky.h"
 #include "scene/resources/surface_tool.h"
 
 constexpr real_t DISTANCE_DEFAULT = 4;

editor/scene/3d/voxel_gi_editor_plugin.cpp

@@ -30,6 +30,8 @@
 
 #include "voxel_gi_editor_plugin.h"
 
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/scene/editor_scene_tabs.cpp

@@ -31,6 +31,7 @@
 #include "editor_scene_tabs.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/resource_loader.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"

editor/scene/material_editor_plugin.cpp

@@ -44,6 +44,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/particle_process_material.h"
+#include "scene/resources/sky.h"
 
 // 3D.
 #include "scene/3d/camera_3d.h"

editor/scene/scene_create_dialog.cpp

@@ -31,6 +31,7 @@
 #include "scene_create_dialog.h"
 
 #include "core/io/dir_access.h"
+#include "core/io/resource_saver.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/create_dialog.h"

editor/scene/texture/texture_3d_editor_plugin.h

@@ -33,6 +33,7 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/spin_box.h"
+#include "scene/resources/material.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 

editor/scene/texture/texture_editor_plugin.cpp

@@ -42,6 +42,7 @@
 #include "scene/resources/compressed_texture.h"
 #include "scene/resources/dpi_texture.h"
 #include "scene/resources/image_texture.h"
+#include "scene/resources/material.h"
 #include "scene/resources/portable_compressed_texture.h"
 
 constexpr const char *texture_2d_shader_code = R"(

editor/scene/texture/texture_layered_editor_plugin.h

@@ -33,6 +33,7 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/spin_box.h"
+#include "scene/resources/material.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 

editor/script/editor_script_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_script_plugin.h"
 
+#include "core/io/resource_loader.h"
 #include "editor/editor_interface.h"
 #include "editor/script/editor_script.h"
 #include "editor/settings/editor_command_palette.h"

editor/shader/shader_editor_plugin.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/resources/shader.h"
 
 class CodeTextEditor;
 class EditorDock;

editor/shader/visual_shader_editor_plugin.cpp

@@ -69,6 +69,7 @@
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
 #include "scene/resources/curve_texture.h"
+#include "scene/resources/sky.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/visual_shader_nodes.h"
 #include "scene/resources/visual_shader_particle_nodes.h"

editor/shader/visual_shader_editor_plugin.h

@@ -35,6 +35,7 @@
 #include "editor/plugins/editor_resource_conversion_plugin.h"
 #include "editor/shader/shader_editor.h"
 #include "scene/gui/graph_edit.h"
+#include "scene/resources/material.h"
 #include "scene/resources/syntax_highlighter.h"
 #include "scene/resources/visual_shader.h"
 

modules/openxr/editor/openxr_action_map_editor.cpp

@@ -32,6 +32,8 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/settings/editor_command_palette.h"

scene/3d/bone_attachment_3d.cpp

@@ -31,6 +31,8 @@
 #include "bone_attachment_3d.h"
 #include "bone_attachment_3d.compat.inc"
 
+#include "core/config/engine.h"
+
 void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "bone_name") {
 		// Because it is a constant function, we cannot use the get_skeleton function.

scene/3d/ik_modifier_3d.cpp

@@ -30,6 +30,8 @@
 
 #include "ik_modifier_3d.h"
 
+#include "core/config/engine.h"
+
 void IKModifier3D::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {

scene/3d/label_3d.h

@@ -32,6 +32,7 @@
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/font.h"
+#include "scene/resources/material.h"
 
 #include "servers/text/text_server.h"
 

scene/3d/look_at_modifier_3d.cpp

@@ -30,6 +30,7 @@
 
 #include "look_at_modifier_3d.h"
 
+#include "core/config/engine.h"
 #include "scene/resources/animation.h"
 
 void LookAtModifier3D::_validate_property(PropertyInfo &p_property) const {

scene/3d/modifier_bone_target_3d.cpp

@@ -30,6 +30,8 @@
 
 #include "modifier_bone_target_3d.h"
 
+#include "core/config/engine.h"
+
 void ModifierBoneTarget3D::_validate_bone_names() {
 	// Prior bone name.
 	if (!bone_name.is_empty()) {

scene/3d/path_3d.h

@@ -32,6 +32,7 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/curve.h"
+#include "scene/resources/material.h"
 
 class Path3D : public Node3D {
 	GDCLASS(Path3D, Node3D);

scene/3d/physics/ray_cast_3d.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
+#include "scene/resources/material.h"
 
 class CollisionObject3D;
 

scene/3d/physics/shape_cast_3d.h

@@ -32,6 +32,7 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/shape_3d.h"
+#include "scene/resources/material.h"
 
 class CollisionObject3D;
 

scene/3d/skeleton_3d.cpp

@@ -35,6 +35,7 @@
 #if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
 #endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
+#include "servers/rendering/rendering_server.h"
 
 void SkinReference::_skin_changed() {
 	if (skeleton_node) {

scene/3d/skeleton_ik_3d.cpp

@@ -30,6 +30,8 @@
 
 #include "skeleton_ik_3d.h"
 
+#include "core/config/engine.h"
+
 FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) {
 	for (int i = children.size() - 1; 0 <= i; --i) {
 		if (p_bone_id == children[i].bone) {

scene/3d/spring_bone_collision_3d.cpp

@@ -30,6 +30,7 @@
 
 #include "spring_bone_collision_3d.h"
 
+#include "core/config/engine.h"
 #include "scene/3d/spring_bone_simulator_3d.h"
 
 PackedStringArray SpringBoneCollision3D::get_configuration_warnings() const {

scene/3d/spring_bone_simulator_3d.cpp

@@ -31,6 +31,7 @@
 #include "spring_bone_simulator_3d.h"
 #include "spring_bone_simulator_3d.compat.inc"
 
+#include "core/config/engine.h"
 #include "scene/3d/spring_bone_collision_3d.h"
 
 // Original VRM Spring Bone movement logic was distributed by (c) VRM Consortium. Licensed under the MIT license.

scene/3d/sprite_3d.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/material.h"
 #include "scene/resources/sprite_frames.h"
 
 class SpriteBase3D : public GeometryInstance3D {

scene/3d/visual_instance_3d.cpp

@@ -31,6 +31,7 @@
 #include "visual_instance_3d.h"
 
 #include "core/config/project_settings.h"
+#include "scene/resources/material.h"
 
 AABB VisualInstance3D::get_aabb() const {
 	AABB ret;

scene/3d/visual_instance_3d.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
+#include "servers/rendering/rendering_server.h"
 
 class TriangleMesh;
 

scene/resources/environment.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "scene/resources/gradient_texture.h"
+#include "scene/resources/sky.h"
 #include "servers/rendering/rendering_server.h"
 
 RID Environment::get_rid() const {

scene/resources/environment.h

@@ -31,9 +31,10 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "scene/resources/sky.h"
 #include "scene/resources/texture.h"
 
+class Sky;
+
 class Environment : public Resource {
 	GDCLASS(Environment, Resource);