Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Add GLTF, DAE and FBX importers enforcement for blend shape mask array

Browse source
This commit is contained in:
Adam Scott 2022-03-24 17:15:23 -04:00
parent 391633760b
commit 5e6d4baa48
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/fbx/data/fbx_mesh_data.cpp
View file

@ -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 {