Skip to content

Commit

Permalink
Merge pull request #60829 from clayjohn/GLES2-html5-blendshapes
Browse files Browse the repository at this point in the history
[GLES2] Unpack blend shape arrays when necessary
  • Loading branch information
akien-mga authored May 6, 2022
2 parents 1f5d4e3 + 33d825c commit 3649382
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/gles2/rasterizer_storage_gles2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2493,7 +2493,13 @@ void RasterizerStorageGLES2::mesh_add_surface(RID p_mesh, uint32_t p_format, VS:
uint32_t new_format = p_format;
PoolVector<uint8_t> unpacked_array = _unpack_half_floats(array, new_format, p_vertex_count);

mesh_add_surface(p_mesh, new_format, p_primitive, unpacked_array, p_vertex_count, p_index_array, p_index_count, p_aabb, p_blend_shapes, p_bone_aabbs);
Vector<PoolVector<uint8_t>> unpacked_blend_shapes;
for (int i = 0; i < p_blend_shapes.size(); i++) {
uint32_t temp_format = p_format; // Just throw this away as it will be the same as new_format
unpacked_blend_shapes.push_back(_unpack_half_floats(p_blend_shapes[i], temp_format, p_vertex_count));
}

mesh_add_surface(p_mesh, new_format, p_primitive, unpacked_array, p_vertex_count, p_index_array, p_index_count, p_aabb, unpacked_blend_shapes, p_bone_aabbs);
return; //do not go any further, above function used unpacked stuff will be used instead.
}

Expand Down

0 comments on commit 3649382

Please sign in to comment.