diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-20 09:39:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 09:39:29 +0200 |
| commit | 4fcc5891450a7dca9c8ebae6ff3765f5f060c442 (patch) | |
| tree | d10b935e7a77774960fefd93ac306db447cc2bfd /core/object/object.cpp | |
| parent | 60dcc4f39c0e6289dba691225c002cd6e77be6ba (diff) | |
| parent | e28fd07b2bbe78db0f286604a6eb469d8a0664be (diff) | |
Merge pull request #49693 from LightningAA/instance-is-not-a-verb
Rename `instance()`->`instantiate()` when it's a verb
Diffstat (limited to 'core/object/object.cpp')
| -rw-r--r-- | core/object/object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 799e63a512..bad40f14d9 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -871,7 +871,7 @@ void Object::set_script(const Variant &p_script) { Ref<Script> s = script; if (!s.is_null()) { - if (s->can_instance()) { + if (s->can_instantiate()) { OBJ_DEBUG_LOCK script_instance = s->instance_create(this); } else if (Engine::get_singleton()->is_editor_hint()) { |