From 61df370810c4e8cce00c69edfab1d61036352cfa Mon Sep 17 00:00:00 2001 From: mightygoat Date: Thu, 5 May 2022 12:25:02 +0530 Subject: Check multimesh before uniform set creation --- servers/rendering/renderer_rd/storage_rd/mesh_storage.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.h b/servers/rendering/renderer_rd/storage_rd/mesh_storage.h index 023d38406c..7d3f603afd 100644 --- a/servers/rendering/renderer_rd/storage_rd/mesh_storage.h +++ b/servers/rendering/renderer_rd/storage_rd/mesh_storage.h @@ -614,6 +614,9 @@ public: _FORCE_INLINE_ RID multimesh_get_3d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const { MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh); + if (multimesh == nullptr) { + return RID(); + } if (!multimesh->uniform_set_3d.is_valid()) { if (!multimesh->buffer.is_valid()) { return RID(); @@ -632,6 +635,9 @@ public: _FORCE_INLINE_ RID multimesh_get_2d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const { MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh); + if (multimesh == nullptr) { + return RID(); + } if (!multimesh->uniform_set_2d.is_valid()) { if (!multimesh->buffer.is_valid()) { return RID(); -- cgit v1.2.3