Allow generating extension api headless.

V-Sekai · Sep 19, 2021 · b6629c7 · b6629c7
1 parent b1063a7
commit b6629c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/core/extension/extension_api_dump.cpp b/core/extension/extension_api_dump.cpp
@@ -861,7 +861,9 @@ void NativeExtensionAPIDump::generate_extension_json_file(const String &p_path)
 	json.instantiate();
 
 	String text = json->stringify(api, "\t", false);
-	FileAccessRef fa = FileAccess::open(p_path, FileAccess::WRITE);
+	Error err;
+	FileAccessRef fa = FileAccess::open(p_path, FileAccess::WRITE, &err);
+	ERR_FAIL_COND(err != OK);
 	CharString cs = text.ascii();
 	fa->store_buffer((const uint8_t *)cs.ptr(), cs.length());
 	fa->close();

diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
@@ -1304,5 +1304,8 @@ CanvasTexture::CanvasTexture() {
 	canvas_texture = RS::get_singleton()->canvas_texture_create();
 }
 CanvasTexture::~CanvasTexture() {
+	if (canvas_texture.is_null()) {
+		return;
+	}
 	RS::get_singleton()->free(canvas_texture);
 }
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
@@ -156,6 +156,9 @@ Shader::Shader() {
 }
 
 Shader::~Shader() {
+	if (shader.is_null()) {
+		return;
+	}
 	RenderingServer::get_singleton()->free(shader);
 }