asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #76669 from smix8/fix_create_from_blend_shape_4.x

Browse source 
Fix SurfaceTool::create_from_blend_shape()
This commit is contained in:
Max Hilbrunner 2023-05-03 20:11:08 +02:00 committed by GitHub
commit 1f104b4a60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/resources/surface_tool.cpp
View file

@ -985,9 +985,21 @@ void SurfaceTool::create_from_blend_shape(const Ref<Mesh> &p_existing, int p_sur
}
ERR_FAIL_COND(shape_idx == -1);
ERR_FAIL_COND(shape_idx >= arr.size());
Array mesh = arr[shape_idx];
ERR_FAIL_COND(mesh.size() != RS::ARRAY_MAX);
_create_list_from_arrays(arr[shape_idx], &vertex_array, &index_array, format);
Array blendshape_mesh_arrays = arr[shape_idx];
ERR_FAIL_COND(blendshape_mesh_arrays.size() != RS::ARRAY_MAX);
Array source_mesh_arrays = p_existing->surface_get_arrays(p_surface);
ERR_FAIL_COND(source_mesh_arrays.size() != RS::ARRAY_MAX);
// Copy BlendShape vertex data over while keeping e.g. bones, weights, index from existing mesh intact.
source_mesh_arrays[RS::ARRAY_VERTEX] = blendshape_mesh_arrays[RS::ARRAY_VERTEX];
source_mesh_arrays[RS::ARRAY_NORMAL] = blendshape_mesh_arrays[RS::ARRAY_NORMAL];
source_mesh_arrays[RS::ARRAY_TANGENT] = blendshape_mesh_arrays[RS::ARRAY_TANGENT];
_create_list_from_arrays(source_mesh_arrays, &vertex_array, &index_array, format);
material = p_existing->surface_get_material(p_surface);
format = p_existing->surface_get_format(p_surface);
for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
if (format & custom_mask[j]) {