Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-29 23:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Never print an error message in Object::get_meta().

Browse Source
This commit is contained in:
Relintai 2022-12-22 19:58:58 +01:00
parent 213f393293
commit 91c50d4bea
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/object/object.cpp
View File

@ -30,14 +30,14 @@
#include "object.h" #include "object.h"
#include "core/object/class_db.h"
#include "core/core_string_names.h" #include "core/core_string_names.h"
#include "core/object/class_db.h"
#include "core/object/message_queue.h" #include "core/object/message_queue.h"
#include "core/object/object_rc.h" #include "core/object/object_rc.h"
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "core/object/resource.h" #include "core/object/resource.h"
#include "core/object/script_language.h" #include "core/object/script_language.h"
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "core/string/translation.h" #include "core/string/translation.h"
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -1063,11 +1063,7 @@ void Object::set_meta(const String &p_name, const Variant &p_value) {
Variant Object::get_meta(const String &p_name, const Variant &p_default) const { Variant Object::get_meta(const String &p_name, const Variant &p_default) const {
if (!metadata.has(p_name)) { if (!metadata.has(p_name)) {
if (p_default != Variant()) { return p_default;
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]; return metadata[p_name];
} }