summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-10-02 20:30:06 +0200
committerGitHub <noreply@github.com>2021-10-02 20:30:06 +0200
commit3c30ca4637be2d76bc05f040a58a7f18262c77b8 (patch)
treeb612da49a78df1645836108659f9c5d999f033e6
parent90f8eb7aa08c650684693f2be7e119ee5e94f2b0 (diff)
parent66a743b2c48081050f1c843bc87b3aef5776f4fb (diff)
downloadredot-engine-3c30ca4637be2d76bc05f040a58a7f18262c77b8.tar.gz
Merge pull request #53337 from V-Sekai/lod-missing-meshes
-rw-r--r--editor/import/scene_importer_mesh.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/import/scene_importer_mesh.cpp b/editor/import/scene_importer_mesh.cpp
index 370394b475..63d1525d4f 100644
--- a/editor/import/scene_importer_mesh.cpp
+++ b/editor/import/scene_importer_mesh.cpp
@@ -115,9 +115,10 @@ void EditorSceneImporterMesh::Surface::split_normals(const LocalVector<int> &p_i
for (int j = 0; j < new_vertex_count; j++) {
data_ptr[current_vertex_count + j] = data_ptr[indices_ptr[j]];
}
+ arrays[i] = data;
} break;
default: {
- ERR_FAIL_MSG("Uhandled array type.");
+ ERR_FAIL_MSG("Unhandled array type.");
} break;
}
}
@@ -260,6 +261,9 @@ void EditorSceneImporterMesh::generate_lods(float p_normal_merge_angle, float p_
if (surfaces[i].primitive != Mesh::PRIMITIVE_TRIANGLES) {
continue;
}
+ if (get_blend_shape_count()) {
+ continue;
+ }
surfaces.write[i].lods.clear();
Vector<Vector3> vertices = surfaces[i].arrays[RS::ARRAY_VERTEX];