diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-25 22:47:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 22:47:16 +0100 |
| commit | 6fce38d1da7f11ec7fd4cf75a981e890673e2479 (patch) | |
| tree | f7e6510d4608fce1f1aedafc93a724459ec03348 /modules/fbx | |
| parent | d3064400c574ac2c784dfae1680ea88eaed71ab7 (diff) | |
| parent | 5e6d4baa48b0104f1f0778d098aa145b8ce368a8 (diff) | |
Merge pull request #59489 from adamscott/add-gltf-dae-fbx-blend-shape-mask-array-format-enforcers
Add GLTF, DAE and FBX importers enforcement for blend shape mask array
Diffstat (limited to 'modules/fbx')
| -rw-r--r-- | modules/fbx/data/fbx_mesh_data.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/fbx/data/fbx_mesh_data.cpp b/modules/fbx/data/fbx_mesh_data.cpp index 643a74f83e..1d59851778 100644 --- a/modules/fbx/data/fbx_mesh_data.cpp +++ b/modules/fbx/data/fbx_mesh_data.cpp @@ -371,6 +371,17 @@ ImporterMeshInstance3D *FBXMeshData::create_fbx_mesh(const ImportState &state, c Array mesh_array = surface->surface_tool->commit_to_arrays(); Array blend_shapes = surface->morphs; + // Enforce blend shape mask array format + for (int i = 0; i < blend_shapes.size(); i++) { + Array bsdata = blend_shapes[i]; + + for (int j = 0; j < Mesh::ARRAY_MAX; j++) { + if (!(Mesh::ARRAY_FORMAT_BLEND_SHAPE_MASK & (1 << j))) { + bsdata[j] = Variant(); + } + } + } + if (surface->material.is_valid()) { mesh->add_surface(Mesh::PRIMITIVE_TRIANGLES, mesh_array, blend_shapes, Dictionary(), surface->material, surface->material->get_name()); } else { |