瀏覽代碼

Merge pull request #107630 from gongpha/crash!-generating-thumbnails-for-invalid-scenes

Add null check on generating thumbnails for PackedScene
Thaddeus Crews 2 月之前
父節點
當前提交
b0dc2b4e50
共有 1 個文件被更改,包括 5 次插入0 次删除
  1. 5 0
      editor/plugins/editor_preview_plugins.cpp

+ 5 - 0
editor/plugins/editor_preview_plugins.cpp

@@ -342,6 +342,11 @@ Ref<Texture2D> EditorPackedScenePreviewPlugin::generate_from_path(const String &
 
 	Node *p_scene = pack->instantiate(); // The instantiated preview scene
 
+	if (!p_scene) {
+		print_error(vformat("Failed to generate scene thumbnail for %s : Failed to instantiate scene", p_path));
+		return Ref<Texture2D>();
+	}
+
 	// Prohibit Viewport class as root when generating thumbnails
 	if (Object::cast_to<Viewport>(p_scene)) {
 		p_scene->queue_free();