diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-05 15:57:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 15:57:50 +0200 |
| commit | 71e41eb395319cc521c2e814126fcc2a5a8034d6 (patch) | |
| tree | 742b044d9f2ba74f06536aba1203d99cd5e5de86 /core/object/object.cpp | |
| parent | f10f2a723290ff2c0647b12a8e3a73086e2ac4c4 (diff) | |
| parent | 0a57f964a357976e023b638e872397ba94123776 (diff) | |
Merge pull request #60597 from reduz/missing-node-resource-placeholders
Diffstat (limited to 'core/object/object.cpp')
| -rw-r--r-- | core/object/object.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 1defd85a14..2b62041533 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -434,15 +434,6 @@ void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid } } - // Something inside the object... :| - bool success = _setv(p_name, p_value); - if (success) { - if (r_valid) { - *r_valid = true; - } - return; - } - #ifdef TOOLS_ENABLED if (script_instance) { bool valid; @@ -456,6 +447,15 @@ void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid } #endif + // Something inside the object... :| + bool success = _setv(p_name, p_value); + if (success) { + if (r_valid) { + *r_valid = true; + } + return; + } + if (r_valid) { *r_valid = false; } @@ -518,15 +518,6 @@ Variant Object::get(const StringName &p_name, bool *r_valid) const { return ret; } else { - // Something inside the object... :| - bool success = _getv(p_name, ret); - if (success) { - if (r_valid) { - *r_valid = true; - } - return ret; - } - #ifdef TOOLS_ENABLED if (script_instance) { bool valid; @@ -539,6 +530,14 @@ Variant Object::get(const StringName &p_name, bool *r_valid) const { } } #endif + // Something inside the object... :| + bool success = _getv(p_name, ret); + if (success) { + if (r_valid) { + *r_valid = true; + } + return ret; + } if (r_valid) { *r_valid = false; |