Merge pull request #57905 from V-Sekai/fix_instance_clear_warnings

Free surface vertex_buffers after vertex_arrays to silence warnings
This commit is contained in:
Rémi Verschelde 2022-02-15 08:32:32 +01:00 committed by GitHub
commit 5a6da0b2a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3578,15 +3578,15 @@ void RendererStorageRD::mesh_instance_set_blend_shape_weight(RID p_mesh_instance
void RendererStorageRD::_mesh_instance_clear(MeshInstance *mi) {
for (uint32_t i = 0; i < mi->surfaces.size(); i++) {
if (mi->surfaces[i].vertex_buffer.is_valid()) {
RD::get_singleton()->free(mi->surfaces[i].vertex_buffer);
}
if (mi->surfaces[i].versions) {
for (uint32_t j = 0; j < mi->surfaces[i].version_count; j++) {
RD::get_singleton()->free(mi->surfaces[i].versions[j].vertex_array);
}
memfree(mi->surfaces[i].versions);
}
if (mi->surfaces[i].vertex_buffer.is_valid()) {
RD::get_singleton()->free(mi->surfaces[i].vertex_buffer);
}
}
mi->surfaces.clear();