Browse Source

Merge pull request #53337 from V-Sekai/lod-missing-meshes

Rémi Verschelde 3 years ago
parent
commit
3c30ca4637
1 changed files with 5 additions and 1 deletions
  1. 5 1
      editor/import/scene_importer_mesh.cpp

+ 5 - 1
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];