diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-17 13:48:24 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-17 13:48:24 +0100 |
| commit | e1ead0fbd111baac21640f9651f680b181e042b6 (patch) | |
| tree | c40c96c86ff34192d2f74534cf07566228df210f /servers/rendering | |
| parent | 2e2a3a5f16251766ac29938d770ed49f3d5bc9b5 (diff) | |
| parent | e9d213e0fdf30505febc3ca3ebaa9aeffc3a30c0 (diff) | |
Merge pull request #68779 from dzil123/fix_renderdummy_mesh_surface_overflow
RendererDummy - Fix buffer overflow due to stale mesh_get_surface
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/dummy/storage/mesh_storage.cpp | 7 | ||||
| -rw-r--r-- | servers/rendering/dummy/storage/mesh_storage.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/servers/rendering/dummy/storage/mesh_storage.cpp b/servers/rendering/dummy/storage/mesh_storage.cpp index adf736eee3..52de998835 100644 --- a/servers/rendering/dummy/storage/mesh_storage.cpp +++ b/servers/rendering/dummy/storage/mesh_storage.cpp @@ -56,3 +56,10 @@ void MeshStorage::mesh_free(RID p_rid) { mesh_owner.free(p_rid); } + +void MeshStorage::mesh_clear(RID p_mesh) { + DummyMesh *m = mesh_owner.get_or_null(p_mesh); + ERR_FAIL_COND(!m); + + m->surfaces.clear(); +} diff --git a/servers/rendering/dummy/storage/mesh_storage.h b/servers/rendering/dummy/storage/mesh_storage.h index 4399f4ab66..28fe8cb80d 100644 --- a/servers/rendering/dummy/storage/mesh_storage.h +++ b/servers/rendering/dummy/storage/mesh_storage.h @@ -116,7 +116,7 @@ public: virtual AABB mesh_get_aabb(RID p_mesh, RID p_skeleton = RID()) override { return AABB(); } virtual void mesh_set_shadow_mesh(RID p_mesh, RID p_shadow_mesh) override {} - virtual void mesh_clear(RID p_mesh) override {} + virtual void mesh_clear(RID p_mesh) override; /* MESH INSTANCE */ |