diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-13 11:46:20 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-13 11:46:20 +0200 |
| commit | cbb95bc8abfeacba8b75d516b26f6464aede439f (patch) | |
| tree | 72d0d6891757a7fe79163659c7a4da1eac846f5e /editor | |
| parent | f9c0c608d4b2337443ed7b3ee8cbc71b722e64f3 (diff) | |
| parent | acb65377cdd31d8add121179e290d90bc03597d0 (diff) | |
| download | redot-engine-cbb95bc8abfeacba8b75d516b26f6464aede439f.tar.gz | |
Merge pull request #83211 from clayjohn/cleanup-mesh-stuff
Cleanup instances of using uint32_t for mesh formats
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/resource_importer_obj.cpp | 2 | ||||
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index 4379a1aae4..97b0a1b4ca 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -486,7 +486,7 @@ Node *EditorOBJImporter::import_scene(const String &p_path, uint32_t p_flags, co mesh.instantiate(); mesh->set_name(m->get_name()); for (int i = 0; i < m->get_surface_count(); i++) { - mesh->add_surface(m->surface_get_primitive_type(i), m->surface_get_arrays(i), Array(), Dictionary(), m->surface_get_material(i)); + mesh->add_surface(m->surface_get_primitive_type(i), m->surface_get_arrays(i), Array(), Dictionary(), m->surface_get_material(i), String(), m->surface_get_format(i)); } ImporterMeshInstance3D *mi = memnew(ImporterMeshInstance3D); diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 7c2a26533e..33c2b0e238 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -391,7 +391,7 @@ void _rescale_importer_mesh(Vector3 p_scale, Ref<ImporterMesh> p_mesh, bool is_s Dictionary lods; String name; Ref<Material> mat; - int fmt_compress_flags = 0; + uint64_t fmt_compress_flags = 0; }; Vector<LocalSurfData> surf_data_by_mesh; @@ -403,7 +403,7 @@ void _rescale_importer_mesh(Vector3 p_scale, Ref<ImporterMesh> p_mesh, bool is_s for (int surf_idx = 0; surf_idx < surf_count; surf_idx++) { Mesh::PrimitiveType prim = p_mesh->get_surface_primitive_type(surf_idx); - const int fmt_compress_flags = p_mesh->get_surface_format(surf_idx); + const uint64_t fmt_compress_flags = p_mesh->get_surface_format(surf_idx); Array arr = p_mesh->get_surface_arrays(surf_idx); String name = p_mesh->get_surface_name(surf_idx); Dictionary lods; @@ -450,7 +450,7 @@ void _rescale_importer_mesh(Vector3 p_scale, Ref<ImporterMesh> p_mesh, bool is_s const Array arr = surf_data_by_mesh[surf_idx].arr; const Array bsarr = surf_data_by_mesh[surf_idx].bsarr; const Dictionary lods = surf_data_by_mesh[surf_idx].lods; - const int fmt_compress_flags = surf_data_by_mesh[surf_idx].fmt_compress_flags; + const uint64_t fmt_compress_flags = surf_data_by_mesh[surf_idx].fmt_compress_flags; const String name = surf_data_by_mesh[surf_idx].name; const Ref<Material> mat = surf_data_by_mesh[surf_idx].mat; |