asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #5891 by not expecting the script instance to be a GDInstance

Browse source 
It could be a placeholder instance as well

(cherry picked from commit 76ea995228)
This commit is contained in:
Bojidar Marinov 2016-08-05 13:44:12 +03:00 committed by Rémi Verschelde
parent 4f8f9a4dbf
commit f25e9a08e1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/gdscript/gd_function.cpp
View file

@ -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()) { 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 = static_cast<GDScript*>(obj_A->get_script_instance()->get_script().ptr());
GDScript *cmp = ins->script.ptr();
//bool found=false; //bool found=false;
while(cmp) { while(cmp) {