Browse Source

Merge pull request #108290 from smix8/revert_csg_opti

Revert "Create more optimized CSGShape3D baked static mesh"
Thaddeus Crews 1 month ago
parent
commit
fffe830077
1 changed files with 1 additions and 14 deletions
  1. 1 14
      modules/csg/csg_shape.cpp

+ 1 - 14
modules/csg/csg_shape.cpp

@@ -36,7 +36,6 @@
 #include "core/math/geometry_2d.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
-#include "scene/resources/surface_tool.h"
 #ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
@@ -737,19 +736,7 @@ void CSGShape3D::update_shape() {
 Ref<ArrayMesh> CSGShape3D::bake_static_mesh() {
 	Ref<ArrayMesh> baked_mesh;
 	if (is_root_shape() && root_mesh.is_valid()) {
-		Ref<SurfaceTool> st;
-		st.instantiate();
-
-		int surface_count = root_mesh->get_surface_count();
-		for (int i = 0; i < surface_count; i++) {
-			st->append_from(root_mesh, i, Transform3D());
-		}
-		st->generate_normals();
-		st->generate_tangents();
-		st->index();
-		st->optimize_indices_for_cache();
-
-		baked_mesh = st->commit();
+		baked_mesh = root_mesh;
 	}
 	return baked_mesh;
 }