diff options
| author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2016-08-05 13:44:12 +0300 |
|---|---|---|
| committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2016-08-05 13:44:12 +0300 |
| commit | 76ea995228df510bfd4212e29f7cb76f13e25fb5 (patch) | |
| tree | 0c8f7749c820b752d7ea2874608024bbf8a2e5a1 | |
| parent | 6ed5d48d0c01c551735121915eb006376269c380 (diff) | |
Fix #5891 by not expecting the script instance to be a GDInstance
It could be a placeholder instance as well
| -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) { |