Merge pull request #83169 from clayjohn/Mesh-format

Fix a few cases where surface format is still 32 bits
godotengine · Oct 11, 2023 · f2f6f99 · f2f6f99
2 parents 1ff9123 + 1df50c7
commit f2f6f99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scene/resources/immediate_mesh.h b/scene/resources/immediate_mesh.h
@@ -63,7 +63,7 @@ class ImmediateMesh : public Mesh {
 		Ref<Material> material;
 		bool vertex_2d = false;
 		int array_len = 0;
-		uint32_t format = 0;
+		uint64_t format = 0;
 		AABB aabb;
 	};
 

diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
@@ -301,7 +301,7 @@ class ArrayMesh : public Mesh {
 
 private:
 	struct Surface {
-		uint32_t format = 0;
+		uint64_t format = 0;
 		int array_length = 0;
 		int index_array_length = 0;
 		PrimitiveType primitive = PrimitiveType::PRIMITIVE_MAX;