From e86a64a2a5ba7403754087cec5632fba89622f03 Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Sun, 27 Feb 2022 22:03:33 +0100
Subject: [PATCH] Add optional 'default' argument to get_meta()

(cherry picked from commit 3eb7fc4bfd376bc27ea3313ccd1da4679c48f4cb)
---
 core/object.cpp        | 11 +++++++++--
 core/object.h          |  4 +---
 doc/classes/Object.xml |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/object.cpp b/core/object.cpp
index 49178a0e1cf..861722dd51f 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1061,8 +1061,15 @@ void Object::set_meta(const String &p_name, const Variant &p_value) {
 	metadata[p_name] = p_value;
 }
 
-Variant Object::get_meta(const String &p_name) const {
+Variant Object::get_meta(const String &p_name, const Variant &p_default) const {
 	ERR_FAIL_COND_V(!metadata.has(p_name), Variant());
+	if (!metadata.has(p_name)) {
+		if (p_default != Variant()) {
+			return p_default;
+		} else {
+			ERR_FAIL_V_MSG(Variant(), "The object does not have any 'meta' values with the key '" + p_name + "'.");
+		}
+	}
 	return metadata[p_name];
 }
 
@@ -1675,7 +1682,7 @@ void Object::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_meta", "name", "value"), &Object::set_meta);
 	ClassDB::bind_method(D_METHOD("remove_meta", "name"), &Object::remove_meta);
-	ClassDB::bind_method(D_METHOD("get_meta", "name"), &Object::get_meta);
+	ClassDB::bind_method(D_METHOD("get_meta", "name", "default"), &Object::get_meta, DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("has_meta", "name"), &Object::has_meta);
 	ClassDB::bind_method(D_METHOD("get_meta_list"), &Object::_get_meta_list_bind);
 
diff --git a/core/object.h b/core/object.h
index c7123f63deb..6fbb349f3c8 100644
--- a/core/object.h
+++ b/core/object.h
@@ -685,12 +685,10 @@ public:
 	void set_script(const RefPtr &p_script);
 	RefPtr get_script() const;
 
-	/* SCRIPT */
-
 	bool has_meta(const String &p_name) const;
 	void set_meta(const String &p_name, const Variant &p_value);
 	void remove_meta(const String &p_name);
-	Variant get_meta(const String &p_name) const;
+	Variant get_meta(const String &p_name, const Variant &p_default = Variant()) const;
 	void get_meta_list(List<String> *p_list) const;
 
 #ifdef TOOLS_ENABLED
diff --git a/doc/classes/Object.xml b/doc/classes/Object.xml
index ff47f2ff8f7..08e473097bf 100644
--- a/doc/classes/Object.xml
+++ b/doc/classes/Object.xml
@@ -215,8 +215,10 @@
 		<method name="get_meta" qualifiers="const">
 			<return type="Variant" />
 			<argument index="0" name="name" type="String" />
+			<argument index="1" name="default" type="Variant" default="null" />
 			<description>
 				Returns the object's metadata entry for the given [code]name[/code].
+				Throws error if the entry does not exist, unless [code]default[/code] is not [code]null[/code] (in which case the default value will be returned).
 			</description>
 		</method>
 		<method name="get_meta_list" qualifiers="const">