Moved meshes to a new subfolder.

drivers/dummy/rasterizer_dummy.h

@@ -32,7 +32,7 @@
 
 #include "core/math/projection.h"
 #include "core/containers/self_list.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "servers/rendering/rasterizer.h"
 #include "servers/rendering_server.h"
 

editor/editor_plugin.cpp

@@ -70,7 +70,7 @@
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering_server.h"
 

editor/import/resource_importer_scene.cpp

@@ -42,7 +42,7 @@
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation.h"
 #include "scene/resources/shapes/box_shape.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/shapes/plane_shape.h"

editor/import/resource_importer_texture_atlas.cpp

@@ -35,7 +35,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/file_access.h"
 #include "editor/editor_atlas_packer.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/texture.h"
 
 String ResourceImporterTextureAtlas::get_importer_name() const {

editor/plugins/collision_polygon_editor_plugin.cpp

@@ -62,7 +62,7 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/texture.h"
 
 void Polygon3DEditor::_notification(int p_what) {

editor/plugins/editor_preview_plugins.cpp

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

editor/plugins/material_editor_plugin.cpp

@@ -58,7 +58,7 @@
 #include "scene/3d/mesh_instance.h"
 #include "scene/gui/box_container.h"
 #include "scene/main/node.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering_server.h"

editor/plugins/material_editor_plugin.h

@@ -35,7 +35,7 @@
 #include "scene/gui/control.h"
 #include "editor/property_editor.h"
 
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 
 #include "scene/resources/material/material.h"
 #include "core/object/object.h"

editor/plugins/mesh_editor_plugin.cpp

@@ -34,7 +34,7 @@
 #include "scene/gui/texture_button.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world_3d.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/math/aabb.h"

editor/plugins/mesh_editor_plugin.h

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

editor/plugins/mesh_instance_editor_plugin.cpp

@@ -59,7 +59,7 @@
 #include "scene/gui/spin_box.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/shapes/shape.h"
 #include "spatial_editor_plugin.h"

editor/plugins/multimesh_editor_plugin.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/3d/mesh_instance.h"
 #include "scene/gui/box_container.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "spatial_editor_plugin.h"
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
@@ -62,7 +62,7 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/main/node.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 void MultiMeshEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

editor/plugins/navigation_obstacle_3d_editor_plugin.h

@@ -35,7 +35,7 @@
 #include "scene/3d/collision_polygon.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/gui/box_container.h"
-#include "scene/resources/immediate_mesh.h"
+#include "scene/resources/mesh/immediate_mesh.h"
 
 #include "scene/3d/navigation_obstacle.h"
 

editor/plugins/spatial_editor_plugin.cpp

@@ -95,7 +95,7 @@
 #include "scene/resources/shader.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/style_box.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 

editor/plugins/spatial_editor_plugin.h

@@ -62,7 +62,7 @@
 #include "editor/spatial_editor_gizmos.h"
 
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/texture.h"
 
 class Camera;

editor/plugins/sprite_editor_plugin.cpp

@@ -39,7 +39,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/resources/bit_map.h"
 #include "thirdparty/misc/clipper.hpp"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"

editor/spatial_editor_gizmos.cpp

@@ -97,11 +97,11 @@
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
 #include "scene/resources/shapes/plane_shape.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/shapes/ray_shape.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/shapes/sphere_shape.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
 #include "servers/rendering_server.h"

editor/spatial_editor_gizmos.h

@@ -45,7 +45,7 @@
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "modules/modules_enabled.gen.h"
 

editor_modules/gltf/gltf_document.cpp

@@ -57,8 +57,8 @@
 #include "scene/animation/animation_player.h"
 #include "scene/main/node.h"
 #include "scene/animation/animation.h"
-#include "scene/resources/multimesh.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/multimesh.h"
+#include "scene/resources/mesh/surface_tool.h"
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap, regex.
 

editor_modules/gltf/packed_scene_gltf.cpp

@@ -35,7 +35,7 @@
 #include "editor/import/resource_importer_scene.h"
 #include "scene/3d/spatial.h"
 #include "scene/animation/animation_player.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "gltf_document.h"
 

editor_modules/gltf/structures/gltf_mesh.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/resource.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 class GLTFMesh : public Resource {
 	GDCLASS(GLTFMesh, Resource);

modules/csg/csg.h

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

modules/csg/csg_shape.cpp

@@ -32,7 +32,7 @@
 
 #include "servers/physics_server.h"
 #include "scene/resources/world_3d.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 void CSGShape::set_use_collision(bool p_enable) {
 	if (use_collision == p_enable) {

modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "modules/csg/csg_shape.h"
 

modules/entity_spell_system/data/items/model_visual_entry.h

@@ -31,7 +31,7 @@ SOFTWARE.
 #include "../../entity_enums.h"
 #include "../../item_enums.h"
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/packed_scene.h"
 
 #include "modules/modules_enabled.gen.h"

modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp

@@ -44,7 +44,7 @@
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/shapes/plane_shape.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/shapes/sphere_shape.h"
 

modules/gridmap/grid_map.cpp

@@ -35,8 +35,8 @@
 #include "mesh_library.h"
 #include "scene/3d/light.h"
 #include "scene/resources/physics_material.h"
-#include "scene/resources/primitive_meshes.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/primitive_meshes.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/scene_string_names.h"
 #include "servers/navigation_server.h"
 #include "servers/rendering_server.h"

modules/gridmap/grid_map.h

@@ -34,7 +34,7 @@
 #include "mesh_library.h"
 #include "scene/3d/navigation.h"
 #include "scene/3d/spatial.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 
 //heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done..
 //should scale better with hardware that supports instancing

modules/gridmap/mesh_library.h

@@ -34,7 +34,7 @@
 #include "core/containers/rb_map.h"
 #include "core/object/resource.h"
 #include "scene/3d/navigation_mesh_instance.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/shapes/shape.h"
 
 class NavigationMesh;

modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "../../mesh_data_resource.h"
 #include "modules/mesh_utils/mesh_utils.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 //you can use MeshUtils.merge_mesh_array(arr) to get optimalized handle points. Just get the vertices from it.
 Vector<PoolIntArray> MDREDMeshDecompose::get_handle_vertex_to_vertex_map(const Array &arrays, const PoolVector3Array &handle_points) {

modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.cpp

@@ -24,8 +24,8 @@ SOFTWARE.
 
 #include "../../mesh_data_resource.h"
 #include "modules/mesh_utils/mesh_utils.h"
-#include "scene/resources/mesh.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/mesh.h"
+#include "scene/resources/mesh/surface_tool.h"
 
 #include "modules/modules_enabled.gen.h"
 

modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "../../mesh_data_resource.h"
 #include "mdr_uv_rect_view.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 void MDRUVRectViewNode::set_edited_resource(const Ref<MeshDataResource> &mdr, const PoolIntArray &indices) {
 	_mdr = mdr;

modules/mesh_data_resource/mesh_data_resource.h

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/object/resource.h"
 #include "core/variant/variant.h"
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "scene/resources/shapes/shape.h"
 

modules/mesh_data_resource/plugin/mdr_import_plugin_base.h

@@ -31,7 +31,7 @@ SOFTWARE.
 #include "core/math/transform.h"
 #include "editor/import/editor_import_plugin.h"
 #include "scene/main/node.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "../mesh_data_resource.h"
 

modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h

@@ -31,7 +31,7 @@ SOFTWARE.
 #include "core/math/basis.h"
 #include "core/math/transform.h"
 #include "scene/main/node.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "../mesh_data_resource.h"
 

modules/mesh_utils/mesh_merger.h

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

modules/mesh_utils/mesh_utils.cpp

@@ -23,7 +23,7 @@ SOFTWARE.
 #include "mesh_utils.h"
 #include "core/containers/local_vector.h"
 #include "core/variant/variant.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "servers/rendering_server.h"
 

modules/mesh_utils/simplify.h

@@ -24,7 +24,7 @@
 
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include <float.h> //FLT_EPSILON, DBL_EPSILON
 #include <limits.h>

modules/navigation/nav_map.cpp

@@ -36,7 +36,7 @@
 #include "nav_link.h"
 #include "nav_obstacle.h"
 #include "nav_region.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 
 #include <Obstacle2d.h>

modules/navigation/pandemonium_navigation_server.cpp

@@ -34,7 +34,7 @@
 
 #ifndef _3D_DISABLED
 //#include "navigation_mesh_generator.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #endif
 

modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp

@@ -31,7 +31,7 @@
 #include "meshinstance2d_navigation_geometry_parser_2d.h"
 
 #include "scene/2d/mesh_instance_2d.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/navigation_2d/navigation_polygon.h"

modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp

@@ -32,7 +32,7 @@
 
 #include "core/math/geometry.h"
 #include "scene/2d/multimesh_instance_2d.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 
 #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/navigation_2d/navigation_polygon.h"

modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp

@@ -31,7 +31,7 @@
 #include "meshinstance3d_navigation_geometry_parser_3d.h"
 
 #include "scene/3d/mesh_instance.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 

modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp

@@ -31,8 +31,8 @@
 #include "multimeshinstance3d_navigation_geometry_parser_3d.h"
 
 #include "scene/3d/multimesh_instance.h"
-#include "scene/resources/mesh.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/mesh.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 

modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp

@@ -40,7 +40,7 @@
 #include "scene/resources/shapes/cylinder_shape.h"
 #include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/shapes/plane_shape.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/shapes/sphere_shape.h"
 

modules/props/prop_mesher.h

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

modules/props/singleton/prop_utils.cpp

@@ -31,7 +31,7 @@ SOFTWARE.
 #include "scene/3d/room_manager.h"
 
 #include "scene/3d/mesh_instance.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 #include "modules/modules_enabled.gen.h"
 

modules/props_2d/prop_2d_mesher.h

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

modules/skeleton_3d/editor/skeleton_editor_plugin.cpp

@@ -57,7 +57,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/shapes/capsule_shape.h"
 #include "scene/resources/shapes/sphere_shape.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 
 #include "physical_bone_editor_plugin.h"
 

modules/skeleton_3d/editor/skeleton_editor_plugin.h

@@ -38,7 +38,7 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/mesh_instance.h"
 #include "../nodes/skeleton.h"
-#include "scene/resources/immediate_mesh.h"
+#include "scene/resources/mesh/immediate_mesh.h"
 
 class EditorInspectorPluginSkeleton;
 class Joint;

modules/skeleton_3d/nodes/skeleton.cpp

@@ -38,7 +38,7 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "physical_bone.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/scene_string_names.h"
 
 void SkinReference::_skin_changed() {

modules/terraman/meshers/terrain_mesher.h

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

modules/terraman_2d/meshers/terrain_2d_mesher.h

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

modules/vhacd/register_types.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "thirdparty/vhacd/public/VHACD.h"
 
 static Vector<PoolVector<Vector3>> convex_decompose(const real_t *p_vertices, int p_vertex_count, const uint32_t *p_triangles, int p_triangle_count, int p_max_convex_hulls = -1, Vector<PoolVector<uint32_t>> *r_convex_indices = nullptr) {

modules/voxelman/meshers/voxel_mesher.h

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

scene/2d/canvas_item.cpp

@@ -46,7 +46,7 @@
 #include "servers/rendering_server.h"
 
 #include "scene/main/scene_tree.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 

scene/2d/mesh_instance_2d.cpp

@@ -30,7 +30,7 @@
 
 #include "mesh_instance_2d.h"
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 void MeshInstance2D::_notification(int p_what) {
 	if (p_what == NOTIFICATION_DRAW) {

scene/2d/multimesh_instance_2d.cpp

@@ -31,7 +31,7 @@
 #include "multimesh_instance_2d.h"
 #include "core/core_string_names.h"
 
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 
 void MultiMeshInstance2D::_notification(int p_what) {
 	if (p_what == NOTIFICATION_DRAW) {

scene/3d/camera.cpp

@@ -37,7 +37,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/environment_3d.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/resources/world_3d.h"
 
 void Camera::_update_audio_listener_state() {

scene/3d/collision_object.cpp

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

scene/3d/collision_shape.cpp

@@ -37,7 +37,7 @@
 #include "scene/resources/shapes/capsule_shape.h"
 #include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/shapes/convex_polygon_shape.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/shapes/ray_shape.h"
 #include "scene/resources/shapes/shape.h"

scene/3d/cpu_particles.cpp

@@ -35,7 +35,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/material/particles_material.h"
 #include "servers/rendering_server.h"
 

scene/3d/immediate_geometry.h

@@ -32,7 +32,7 @@
 
 #include "scene/3d/visual_instance.h"
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 class Texture;
 

scene/3d/importer_mesh_instance_3d.cpp

@@ -30,7 +30,7 @@
 
 #include "importer_mesh_instance_3d.h"
 
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/mesh/importer_mesh.h"
 
 void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) {
 	mesh = p_mesh;

scene/3d/label_3d.cpp

@@ -31,7 +31,7 @@
 #include "label_3d.h"
 
 #include "core/core_string_names.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/theme.h"
 #include "scene/scene_string_names.h"
 

scene/3d/light.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 
 void Light::set_param(Param p_param, float p_value) {
 	ERR_FAIL_INDEX(p_param, PARAM_MAX);

scene/3d/listener.cpp

@@ -31,7 +31,7 @@
 #include "listener.h"
 
 #include "scene/main/viewport.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 void Listener::_update_audio_listener_state() {
 }

scene/3d/mesh_instance.cpp

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

scene/3d/multimesh_instance.cpp

@@ -30,7 +30,7 @@
 
 #include "multimesh_instance.h"
 
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 
 void MultiMeshInstance::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_multimesh", "multimesh"), &MultiMeshInstance::set_multimesh);

scene/3d/navigation_agent.cpp

@@ -35,7 +35,7 @@
 #include "scene/3d/navigation.h"
 #include "scene/3d/navigation_link_3d.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation/navigation_path_query_result_3d.h"
 #include "servers/navigation_server.h"

scene/3d/navigation_link_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "mesh_instance.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
 

scene/3d/navigation_mesh_instance.cpp

@@ -34,7 +34,7 @@
 #include "core/os/os.h"
 #include "mesh_instance.h"
 #include "navigation.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/world_3d.h"

scene/3d/navigation_obstacle.cpp

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

scene/3d/path.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "scene/resources/curve.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering_server.h"

scene/3d/portal.cpp

@@ -36,7 +36,7 @@
 #include "room_group.h"
 #include "room_manager.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 

scene/3d/position_3d.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "position_3d.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 Position3D::Position3D() {
 }

scene/3d/ray_cast.cpp

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

scene/3d/room_group.cpp

@@ -33,7 +33,7 @@
 #include "core/math/geometry.h"
 #include "room.h"
 #include "room_manager.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 

scene/3d/room_manager.cpp

@@ -44,7 +44,7 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/sprite_3d.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "scene/resources/world_3d.h"
 #include "visibility_notifier.h"
 

scene/3d/shape_cast.cpp

@@ -35,7 +35,7 @@
 #include "mesh_instance.h"
 #include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 
 void ShapeCast::_notification(int p_what) {

scene/3d/soft_body.cpp

@@ -35,7 +35,7 @@
 #include "core/containers/rid.h"
 #include "scene/3d/collision_object.h"
 #include "scene/3d/physics_body.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 

scene/main/scene_tree.cpp

@@ -48,7 +48,7 @@
 #include "scene/gui/control.h"
 #include "scene/resources/font/dynamic_font.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
@@ -58,7 +58,7 @@
 #include "viewport.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype.
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
 

scene/main/viewport.cpp

@@ -52,7 +52,7 @@
 #include "scene/gui/viewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/timer.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"

scene/register_scene_types.cpp

@@ -153,12 +153,12 @@
 #include "scene/resources/font/dynamic_font.h"
 #include "scene/resources/gradient.h"
 #include "scene/resources/shapes/height_map_shape.h"
-#include "scene/resources/immediate_mesh.h"
+#include "scene/resources/mesh/immediate_mesh.h"
 #include "scene/resources/shapes_2d/line_shape_2d.h"
 #include "scene/resources/material/material.h"
-#include "scene/resources/mesh.h"
-#include "scene/resources/mesh_data_tool.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/mesh.h"
+#include "scene/resources/mesh/mesh_data_tool.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
@@ -167,8 +167,8 @@
 #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"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/mesh/polygon_path_finder.h"
+#include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/shapes/ray_shape.h"
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
 #include "scene/resources/resource_format_text.h"
@@ -176,7 +176,7 @@
 
 #include "scene/resources/sky.h"
 #include "scene/resources/shapes/sphere_shape.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "scene/gui/resources/syntax_highlighter.h"
 #include "scene/resources/text_file.h"
 #include "scene/resources/texture.h"
@@ -225,7 +225,7 @@
 #include "scene/3d/vehicle_body.h"
 #include "scene/3d/visibility_notifier.h"
 #include "scene/resources/environment_3d.h"
-#include "scene/resources/multimesh.h"
+#include "scene/resources/mesh/multimesh.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
 #endif

scene/resources/SCsub

@@ -53,7 +53,6 @@ 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")
@@ -63,6 +62,15 @@ for o in material_obj:
 
 env.scene_sources += scene_obj
 
+# mesh
+mesh_obj = []
+env.add_source_files(mesh_obj, "mesh/*.cpp")
+
+for o in mesh_obj:
+    scene_obj.append(o)
+
+env.scene_sources += scene_obj
+
 # Needed to force rebuilding the scene files when the thirdparty code is updated.
 env.Depends(scene_obj, thirdparty_obj)
 

scene/resources/mesh/immediate_mesh.h

@@ -32,7 +32,7 @@
 #define IMMEDIATE_MESH_H
 
 #include "core/containers/vector.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 class ImmediateMesh : public Mesh {
 	GDCLASS(ImmediateMesh, Mesh)

scene/resources/mesh/importer_mesh.cpp

@@ -31,7 +31,7 @@
 #include "importer_mesh.h"
 
 #include "core/math/random_pcg.h"
-#include "scene/resources/surface_tool.h"
+#include "scene/resources/mesh/surface_tool.h"
 #include "core/object/method_bind_ext.gen.inc"
 
 #include <cstdint>

scene/resources/mesh/importer_mesh.h

@@ -35,7 +35,7 @@
 #include "core/containers/local_vector.h"
 #include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/shapes/convex_polygon_shape.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "scene/resources/navigation/navigation_mesh.h"
 
 #include <cstdint>

scene/resources/mesh/mesh_data_tool.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 class MeshDataTool : public Reference {
 	GDCLASS(MeshDataTool, Reference);

scene/resources/mesh/multimesh.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 #include "servers/rendering_server.h"
 
 class MultiMesh : public Resource {

scene/resources/mesh/primitive_meshes.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "scene/resources/font/font.h"
-#include "scene/resources/mesh.h"
+#include "scene/resources/mesh/mesh.h"
 
 ///@TODO probably should change a few integers to unsigned integers...