Moved materials into a new subfolder.

editor/editor_resource_picker.cpp

@@ -64,7 +64,7 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/main/node.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"

editor/plugins/collision_polygon_editor_plugin.cpp

@@ -61,7 +61,7 @@
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/texture.h"
 

editor/plugins/editor_preview_plugins.cpp

@@ -36,7 +36,7 @@
 #include "editor/editor_scale.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/font/dynamic_font.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "servers/audio/audio_stream.h"
 #include "core/config/project_settings.h"

editor/plugins/material_editor_plugin.cpp

@@ -35,7 +35,7 @@
 #include "scene/gui/viewport_container.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment_3d.h"
-#include "scene/resources/particles_material.h"
+#include "scene/resources/material/particles_material.h"
 #include "scene/resources/sky.h"
 #include "scene/resources/world_3d.h"
 #include "core/object/class_db.h"

editor/plugins/material_editor_plugin.h

@@ -37,7 +37,7 @@
 
 #include "scene/resources/primitive_meshes.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"

editor/plugins/mesh_editor_plugin.h

@@ -38,7 +38,7 @@
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 class Camera;

editor/plugins/path_editor_plugin.cpp

@@ -55,7 +55,7 @@
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"
 #include "scene/resources/curve.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "spatial_editor_plugin.h"
 
 String PathSpatialGizmo::get_handle_name(int p_id, bool p_secondary) const {

editor/plugins/room_manager_editor_plugin.h

@@ -32,7 +32,7 @@
 
 #include "editor/editor_plugin.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 

editor/plugins/spatial_editor_plugin.h

@@ -61,7 +61,7 @@
 
 #include "editor/spatial_editor_gizmos.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/texture.h"
 

editor/spatial_editor_gizmos.cpp

@@ -92,7 +92,7 @@
 #include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/shapes/cylinder_shape.h"
 #include "scene/resources/shapes/height_map_shape.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"

editor_modules/gltf/gltf_document.h

@@ -35,7 +35,7 @@
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/spatial.h"
 #include "scene/animation/animation_player.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/texture.h"
 
 #include "extensions/gltf_document_extension.h"

modules/csg/csg.h

@@ -42,7 +42,7 @@
 #include "core/containers/pool_vector.h"
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 struct CSGBrush {

modules/entity_spell_system/material_cache/ess_material_cache.h

@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "modules/modules_enabled.gen.h"
 

modules/entity_spell_system/material_cache/ess_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class TexturePacker;
 class PropData;

modules/material_maker/editor/widgets/gradient_editor/gradient_editor.cpp

@@ -16,7 +16,7 @@
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 MMGraphNode *MMGradientEditor::get_graph_node() {
 	return graph_node;

modules/mesh_data_resource/props/prop_data_mesh_data.cpp

@@ -27,7 +27,7 @@ SOFTWARE.
 #ifdef MODULE_PROPS_ENABLED
 
 #include "../nodes/mesh_data_instance.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 Ref<MeshDataResource> PropDataMeshData::get_mesh() const {
 	return _mesh;

modules/mesh_data_resource/props_2d/prop_2d_data_mesh_data.cpp

@@ -27,7 +27,7 @@ SOFTWARE.
 #ifdef MODULE_PROPS_2D_ENABLED
 
 #include "../nodes/mesh_data_instance.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 Ref<MeshDataResource> Prop2DDataMeshData::get_mesh() const {
 	return _mesh;

modules/mesh_utils/mesh_merger.h

@@ -37,7 +37,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

modules/props/material_cache/prop_material_cache.h

@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class PropData;
 

modules/props/material_cache/prop_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class TexturePacker;
 class PropData;

modules/props/prop_instance.h

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "scene/3d/spatial.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "core/math/vector3.h"
 

modules/props/prop_mesher.h

@@ -32,7 +32,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

modules/props/singleton/prop_cache.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "core/os/mutex.h"
 

modules/props/tiled_wall/tiled_wall_data.h

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/texture.h"
 
 #include "modules/modules_enabled.gen.h"

modules/props_2d/material_cache/prop_2d_material_cache.h

@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class Prop2DData;
 

modules/props_2d/material_cache/prop_2d_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class TexturePacker;
 class Prop2DData;

modules/props_2d/prop_2d_instance.h

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "scene/2d/node_2d.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "core/math/vector3.h"
 

modules/props_2d/prop_2d_mesher.h

@@ -32,7 +32,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

modules/props_2d/props/prop_2d_data_entry.h

@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/math/transform_2d.h"
 #include "core/object/resource.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "modules/modules_enabled.gen.h"
 

modules/props_2d/singleton/prop_2d_cache.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "core/os/mutex.h"
 

modules/props_2d/tiled_wall/tiled_wall_2d_data.h

@@ -30,7 +30,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/texture.h"
 
 #include "modules/modules_enabled.gen.h"

modules/terraman/library/terrain_library.h

@@ -25,7 +25,7 @@ SOFTWARE.
 #include "core/object/resource.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_light.h"
 #include "terrain_surface.h"

modules/terraman/library/terrain_library_merger.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "terrain_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_light.h"
 #include "terrain_surface_merger.h"

modules/terraman/library/terrain_library_merger_pcm.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "terrain_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_light.h"
 #include "terrain_surface_merger.h"

modules/terraman/library/terrain_library_simple.h

@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "terrain_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_light.h"
 #include "terrain_surface_simple.h"

modules/terraman/library/terrain_material_cache.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "terrain_library.h"
 

modules/terraman/library/terrain_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../defines.h"
 

modules/terraman/library/terrain_surface.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "terrain_library.h"
 

modules/terraman/meshers/terrain_mesher.h

@@ -36,7 +36,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

modules/terraman_2d/library/terrain_2d_library.h

@@ -25,7 +25,7 @@ SOFTWARE.
 #include "core/object/resource.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_2d_light.h"
 #include "terrain_2d_surface.h"

modules/terraman_2d/library/terrain_2d_library_merger.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "terrain_2d_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_2d_light.h"
 #include "terrain_2d_surface_merger.h"

modules/terraman_2d/library/terrain_2d_library_merger_pcm.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "terrain_2d_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_2d_light.h"
 #include "terrain_2d_surface_merger.h"

modules/terraman_2d/library/terrain_2d_library_simple.h

@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "terrain_2d_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/terrain_2d_light.h"
 #include "terrain_2d_surface_simple.h"

modules/terraman_2d/library/terrain_2d_material_cache.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "terrain_2d_library.h"
 

modules/terraman_2d/library/terrain_2d_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../defines.h"
 

modules/terraman_2d/library/terrain_2d_surface.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "terrain_2d_library.h"
 

modules/terraman_2d/meshers/terrain_2d_mesher.h

@@ -35,7 +35,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

modules/voxelman/library/voxel_library.h

@@ -25,7 +25,7 @@ SOFTWARE.
 #include "core/object/resource.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/voxel_light.h"
 #include "voxel_surface.h"

modules/voxelman/library/voxel_library_merger.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "voxel_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/voxel_light.h"
 #include "voxel_surface_merger.h"

modules/voxelman/library/voxel_library_merger_pcm.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "voxel_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/voxel_light.h"
 #include "voxel_surface_merger.h"

modules/voxelman/library/voxel_library_simple.h

@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "voxel_library.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../data/voxel_light.h"
 #include "voxel_surface_simple.h"

modules/voxelman/library/voxel_material_cache.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "voxel_library.h"
 

modules/voxelman/library/voxel_material_cache_pcm.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "../defines.h"
 

modules/voxelman/library/voxel_surface.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 #include "voxel_library.h"
 

modules/voxelman/meshers/voxel_mesher.h

@@ -34,7 +34,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 
 #include "modules/modules_enabled.gen.h"

scene/2d/canvas_item.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "scene/main/node.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class CanvasLayer;
 class Viewport;

scene/2d/cpu_particles_2d.cpp

@@ -36,7 +36,7 @@
 #include "core/math/transform_interpolator.h"
 
 #include "scene/2d/canvas_item.h"
-#include "scene/resources/particles_material.h"
+#include "scene/resources/material/particles_material.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering_server.h"
 

scene/3d/camera.cpp

@@ -36,7 +36,7 @@
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment_3d.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/world_3d.h"
 

scene/3d/cpu_particles.cpp

@@ -36,7 +36,7 @@
 #include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/particles_material.h"
+#include "scene/resources/material/particles_material.h"
 #include "servers/rendering_server.h"
 
 AABB CPUParticles::get_aabb() const {

scene/3d/label_3d.h

@@ -33,7 +33,7 @@
 
 #include "scene/3d/visual_instance.h"
 #include "scene/resources/font/font.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class TriangleMesh;
 

scene/3d/mesh_instance.cpp

@@ -34,7 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/core_string_names.h"
 #include "physics_body.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering/rendering_server_globals.h"

scene/3d/navigation_agent.cpp

@@ -34,7 +34,7 @@
 #include "core/math/geometry.h"
 #include "scene/3d/navigation.h"
 #include "scene/3d/navigation_link_3d.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation/navigation_path_query_result_3d.h"

scene/3d/navigation_obstacle.cpp

@@ -35,7 +35,7 @@
 #include "scene/3d/navigation.h"
 #include "scene/3d/physics_body.h"
 #include "scene/3d/spatial.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"

scene/3d/ray_cast.cpp

@@ -33,7 +33,7 @@
 #include "collision_object.h"
 #include "core/config/engine.h"
 #include "mesh_instance.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"

scene/3d/shape_cast.cpp

@@ -34,7 +34,7 @@
 #include "core/config/engine.h"
 #include "mesh_instance.h"
 #include "scene/resources/shapes/concave_polygon_shape.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/world_3d.h"
 

scene/3d/sprite_3d.h

@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "scene/3d/visual_instance.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class TriangleMesh;
 class SpriteFrames;

scene/3d/visual_instance.cpp

@@ -30,7 +30,7 @@
 
 #include "visual_instance.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering_server.h"

scene/animation/root_motion_view.cpp

@@ -30,7 +30,7 @@
 
 #include "root_motion_view.h"
 #include "scene/animation/animation_tree.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 void RootMotionView::set_animation_path(const NodePath &p_path) {
 	path = p_path;
 	first = true;

scene/main/scene_tree.cpp

@@ -47,7 +47,7 @@
 #include "scene/debugger/script_debugger_remote.h"
 #include "scene/gui/control.h"
 #include "scene/resources/font/dynamic_font.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/scene_string_names.h"

scene/register_scene_types.cpp

@@ -155,7 +155,7 @@
 #include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/immediate_mesh.h"
 #include "scene/resources/shapes_2d/line_shape_2d.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/mesh_data_tool.h"
 #include "scene/resources/multimesh.h"
@@ -164,7 +164,7 @@
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_2d/navigation_polygon.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/particles_material.h"
+#include "scene/resources/material/particles_material.h"
 #include "scene/resources/physics_material.h"
 #include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/polygon_path_finder.h"

scene/resources/SCsub

@@ -53,6 +53,14 @@ env.add_source_files(font_obj, "font/*.cpp")
 for o in font_obj:
     scene_obj.append(o)
 
+
+# material
+material_obj = []
+env.add_source_files(material_obj, "material/*.cpp")
+
+for o in material_obj:
+    scene_obj.append(o)
+
 env.scene_sources += scene_obj
 
 # Needed to force rebuilding the scene files when the thirdparty code is updated.

scene/resources/material/particles_material.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/rid.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 
 class ParticlesMaterial : public Material {
 	GDCLASS(ParticlesMaterial, Material);

scene/resources/mesh.h

@@ -34,7 +34,7 @@
 #include "core/math/triangle_mesh.h"
 #include "core/object/resource.h"
 
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #include "scene/resources/shapes/shape.h"
 #include "servers/rendering_server.h"
 

servers/navigation_server.cpp

@@ -39,7 +39,7 @@
 #ifdef DEBUG_ENABLED
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "scene/resources/material.h"
+#include "scene/resources/material/material.h"
 #endif
 
 NavigationServer *NavigationServer::singleton = nullptr;