Add some multimesh null checks to avoid crash

beicause · beicause · commit 5352638f954c · 2025-07-13T10:09:36.000+08:00
diff --git a/drivers/gles3/storage/mesh_storage.h b/drivers/gles3/storage/mesh_storage.h
@@ -535,21 +535,25 @@ class MeshStorage : public RendererMeshStorage {
 
 	_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);
 		return multimesh->xform_format;
 	}
 
 	_FORCE_INLINE_ bool multimesh_uses_colors(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, false);
 		return multimesh->uses_colors;
 	}
 
 	_FORCE_INLINE_ bool multimesh_uses_custom_data(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, false);
 		return multimesh->uses_custom_data;
 	}
 
 	_FORCE_INLINE_ uint32_t multimesh_get_instances_to_draw(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		if (multimesh->visible_instances >= 0) {
 			return multimesh->visible_instances;
 		}
@@ -558,21 +562,25 @@ class MeshStorage : public RendererMeshStorage {
 
 	_FORCE_INLINE_ GLuint multimesh_get_gl_buffer(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		return multimesh->buffer;
 	}
 
 	_FORCE_INLINE_ uint32_t multimesh_get_stride(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		return multimesh->stride_cache;
 	}
 
 	_FORCE_INLINE_ uint32_t multimesh_get_color_offset(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		return multimesh->color_offset_cache;
 	}
 
 	_FORCE_INLINE_ uint32_t multimesh_get_custom_data_offset(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		return multimesh->custom_data_offset_cache;
 	}
 
diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.h b/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
@@ -689,26 +689,31 @@ class MeshStorage : public RendererMeshStorage {
 
 	_FORCE_INLINE_ bool multimesh_uses_indirect(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, false);
 		return multimesh->indirect;
 	}
 
 	_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);
 		return multimesh->xform_format;
 	}
 
 	_FORCE_INLINE_ bool multimesh_uses_colors(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, false);
 		return multimesh->uses_colors;
 	}
 
 	_FORCE_INLINE_ bool multimesh_uses_custom_data(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, false);
 		return multimesh->uses_custom_data;
 	}
 
 	_FORCE_INLINE_ uint32_t multimesh_get_instances_to_draw(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
+		ERR_FAIL_NULL_V(multimesh, 0);
 		if (multimesh->visible_instances >= 0) {
 			return multimesh->visible_instances;
 		}

Original file line number	Diff line number	Diff line change
`@@ -535,21 +535,25 @@ class MeshStorage : public RendererMeshStorage {`
`535`	`535`
`536`	`536`	`_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {`
`537`	`537`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`538`	`+ ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);`
`538`	`539`	`return multimesh->xform_format;`
`539`	`540`	`}`
`540`	`541`
`541`	`542`	`_FORCE_INLINE_ bool multimesh_uses_colors(RID p_multimesh) const {`
`542`	`543`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`544`	`+ ERR_FAIL_NULL_V(multimesh, false);`
`543`	`545`	`return multimesh->uses_colors;`
`544`	`546`	`}`
`545`	`547`
`546`	`548`	`_FORCE_INLINE_ bool multimesh_uses_custom_data(RID p_multimesh) const {`
`547`	`549`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`550`	`+ ERR_FAIL_NULL_V(multimesh, false);`
`548`	`551`	`return multimesh->uses_custom_data;`
`549`	`552`	`}`
`550`	`553`
`551`	`554`	`_FORCE_INLINE_ uint32_t multimesh_get_instances_to_draw(RID p_multimesh) const {`
`552`	`555`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`556`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`553`	`557`	`if (multimesh->visible_instances >= 0) {`
`554`	`558`	`return multimesh->visible_instances;`
`555`	`559`	`}`
`@@ -558,21 +562,25 @@ class MeshStorage : public RendererMeshStorage {`
`558`	`562`
`559`	`563`	`_FORCE_INLINE_ GLuint multimesh_get_gl_buffer(RID p_multimesh) const {`
`560`	`564`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`565`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`561`	`566`	`return multimesh->buffer;`
`562`	`567`	`}`
`563`	`568`
`564`	`569`	`_FORCE_INLINE_ uint32_t multimesh_get_stride(RID p_multimesh) const {`
`565`	`570`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`571`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`566`	`572`	`return multimesh->stride_cache;`
`567`	`573`	`}`
`568`	`574`
`569`	`575`	`_FORCE_INLINE_ uint32_t multimesh_get_color_offset(RID p_multimesh) const {`
`570`	`576`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`577`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`571`	`578`	`return multimesh->color_offset_cache;`
`572`	`579`	`}`
`573`	`580`
`574`	`581`	`_FORCE_INLINE_ uint32_t multimesh_get_custom_data_offset(RID p_multimesh) const {`
`575`	`582`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`583`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`576`	`584`	`return multimesh->custom_data_offset_cache;`
`577`	`585`	`}`
`578`	`586`
Original file line number	Diff line number	Diff line change
`@@ -689,26 +689,31 @@ class MeshStorage : public RendererMeshStorage {`
`689`	`689`
`690`	`690`	`_FORCE_INLINE_ bool multimesh_uses_indirect(RID p_multimesh) const {`
`691`	`691`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`692`	`+ ERR_FAIL_NULL_V(multimesh, false);`
`692`	`693`	`return multimesh->indirect;`
`693`	`694`	`}`
`694`	`695`
`695`	`696`	`_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {`
`696`	`697`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`698`	`+ ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);`
`697`	`699`	`return multimesh->xform_format;`
`698`	`700`	`}`
`699`	`701`
`700`	`702`	`_FORCE_INLINE_ bool multimesh_uses_colors(RID p_multimesh) const {`
`701`	`703`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`704`	`+ ERR_FAIL_NULL_V(multimesh, false);`
`702`	`705`	`return multimesh->uses_colors;`
`703`	`706`	`}`
`704`	`707`
`705`	`708`	`_FORCE_INLINE_ bool multimesh_uses_custom_data(RID p_multimesh) const {`
`706`	`709`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`710`	`+ ERR_FAIL_NULL_V(multimesh, false);`
`707`	`711`	`return multimesh->uses_custom_data;`
`708`	`712`	`}`
`709`	`713`
`710`	`714`	`_FORCE_INLINE_ uint32_t multimesh_get_instances_to_draw(RID p_multimesh) const {`
`711`	`715`	`MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);`
	`716`	`+ ERR_FAIL_NULL_V(multimesh, 0);`
`712`	`717`	`if (multimesh->visible_instances >= 0) {`
`713`	`718`	`return multimesh->visible_instances;`
`714`	`719`	`}`