diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-05 13:19:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 13:19:30 +0100 |
| commit | 744ab88884cc0794c47be2393b5cc3490989af00 (patch) | |
| tree | 2d6fd1b3c94b28cf6dbb33cff3263a05e8a34610 /modules/assimp/editor_scene_importer_assimp.cpp | |
| parent | eed484d054d56ead9954158683105d200700e6fb (diff) | |
| parent | 5ef62e546f485e5f2798230dcfbea2b4ddecbe6e (diff) | |
Merge pull request #36382 from aaronfranke/unhide-the-hidden
Unhide hidden members by renaming them and rebind Mesh enums
Diffstat (limited to 'modules/assimp/editor_scene_importer_assimp.cpp')
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 21ba67ecd3..796ee27a7d 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -838,7 +838,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat String ai_anim_mesh_name = AssimpUtils::get_assimp_string(ai_mesh->mAnimMeshes[j]->mName); if (!morph_mesh_string_lookup.has(ai_anim_mesh_name)) { morph_mesh_string_lookup.insert(ai_anim_mesh_name, j); - mesh->set_blend_shape_mode(Mesh::BLEND_SHAPE_MODE_NORMALIZED); + mesh->set_blend_shape_mode(ArrayMesh::BLEND_SHAPE_MODE_NORMALIZED); if (ai_anim_mesh_name.empty()) { ai_anim_mesh_name = String("morph_") + itos(j); } |