godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4772 from iap-mutant/PR-fix4748 

Fix #4748: proper call to base class function
This commit is contained in:
Rémi Verschelde 2016-05-23 13:29:38 +02:00
parent 29d9eb02b9 7caabd9398
commit 8a6933afb1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gd_script.cpp
View File

@ -812,7 +812,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
if (E) { if (E) {
*dst=((GDFunction*)&E->get())->call(p_instance,(const Variant**)argptrs,argc,err); *dst=E->get()->call(p_instance,(const Variant**)argptrs,argc,err);
} else if (gds->native.ptr()) { } else if (gds->native.ptr()) {
if (*methodname!=GDScriptLanguage::get_singleton()->strings._init) { if (*methodname!=GDScriptLanguage::get_singleton()->strings._init) {