Browse Source

Merge pull request #83169 from clayjohn/Mesh-format

Fix a few cases where surface format is still 32 bits
Rémi Verschelde 1 year ago
parent
commit
f2f6f99241
2 changed files with 2 additions and 2 deletions
  1. 1 1
      scene/resources/immediate_mesh.h
  2. 1 1
      scene/resources/mesh.h

+ 1 - 1
scene/resources/immediate_mesh.h

@@ -63,7 +63,7 @@ class ImmediateMesh : public Mesh {
 		Ref<Material> material;
 		Ref<Material> material;
 		bool vertex_2d = false;
 		bool vertex_2d = false;
 		int array_len = 0;
 		int array_len = 0;
-		uint32_t format = 0;
+		uint64_t format = 0;
 		AABB aabb;
 		AABB aabb;
 	};
 	};
 
 

+ 1 - 1
scene/resources/mesh.h

@@ -301,7 +301,7 @@ class ArrayMesh : public Mesh {
 
 
 private:
 private:
 	struct Surface {
 	struct Surface {
-		uint32_t format = 0;
+		uint64_t format = 0;
 		int array_length = 0;
 		int array_length = 0;
 		int index_array_length = 0;
 		int index_array_length = 0;
 		PrimitiveType primitive = PrimitiveType::PRIMITIVE_MAX;
 		PrimitiveType primitive = PrimitiveType::PRIMITIVE_MAX;