浏览代码

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

Fix #5891 by not expecting the script instance to be a GDInstance
Rémi Verschelde 9 年之前
父节点
当前提交
38cbf69e24
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      modules/gdscript/gd_function.cpp

+ 1 - 2
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) {