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

Merge pull request #6045 from bojidar-bg/extends-on-placeholders

Browse source 
Fix #5891 by not expecting the script instance to be a GDInstance
This commit is contained in:
Rémi Verschelde 2016-08-08 10:22:13 +02:00 committed by GitHub
commit 38cbf69e24
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()) {
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) {