From ffdac72eaa8691d26965b158cbe314b4dd828f06 Mon Sep 17 00:00:00 2001
From: Haoyu Qiu <timothyqiu32@gmail.com>
Date: Fri, 30 Sep 2022 09:55:32 +0800
Subject: Add various null checks in RenderingServer

---
 servers/rendering/renderer_rd/renderer_scene_render_rd.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'servers/rendering/renderer_rd/renderer_scene_render_rd.cpp')

diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
index 667d910a69..74b8f0890f 100644
--- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
+++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
@@ -3621,6 +3621,7 @@ TypedArray<Image> RendererSceneRenderRD::bake_render_uv2(RID p_base, const Typed
 	//RID sampled_light;
 
 	RenderGeometryInstance *gi = geometry_instance_create(p_base);
+	ERR_FAIL_NULL_V(gi, TypedArray<Image>());
 
 	uint32_t sc = RSG::mesh_storage->mesh_get_surface_count(p_base);
 	Vector<RID> materials;
-- 
cgit v1.2.3