diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-08 10:22:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 10:22:13 +0200 |
| commit | 38cbf69e24814cabad984e6ee29e9cbc3b384871 (patch) | |
| tree | 72b23a431e1f9ab6e4d0244bdc3ffb601b7b5189 /modules/gdscript | |
| parent | 72748d1363d090f33d5ca6b9c00142b5e8f7d78f (diff) | |
| parent | 76ea995228df510bfd4212e29f7cb76f13e25fb5 (diff) | |
Merge pull request #6045 from bojidar-bg/extends-on-placeholders
Fix #5891 by not expecting the script instance to be a GDInstance
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_function.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index de86eb2ab9..47d8f0b40f 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -372,8 +372,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a if (obj_A->get_script_instance() && obj_A->get_script_instance()->get_language()==GDScriptLanguage::get_singleton()) { - GDInstance *ins = static_cast<GDInstance*>(obj_A->get_script_instance()); - GDScript *cmp = ins->script.ptr(); + GDScript *cmp = static_cast<GDScript*>(obj_A->get_script_instance()->get_script().ptr()); //bool found=false; while(cmp) { |