浏览代码

Merge pull request #19524 from jahd2602/master

Inner classes' functions now appear in the editor's functions panel
Rémi Verschelde 7 年之前
父节点
当前提交
d2b75557a5
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      modules/gdscript/gdscript_editor.cpp

+ 7 - 0
modules/gdscript/gdscript_editor.cpp

@@ -118,6 +118,13 @@ bool GDScriptLanguage::validate(const String &p_script, int &r_line_error, int &
 			funcs[cl->static_functions[i]->line] = cl->static_functions[i]->name;
 			funcs[cl->static_functions[i]->line] = cl->static_functions[i]->name;
 		}
 		}
 
 
+		for (int i = 0; i < cl->subclasses.size(); i++) {
+			for (int j = 0; j < cl->subclasses[i]->functions.size(); j++) {
+
+				funcs[cl->subclasses[i]->functions[j]->line] = String(cl->subclasses[i]->name) + "." + String(cl->subclasses[i]->functions[j]->name);
+			}
+		}
+
 		for (Map<int, String>::Element *E = funcs.front(); E; E = E->next()) {
 		for (Map<int, String>::Element *E = funcs.front(); E; E = E->next()) {
 
 
 			r_functions->push_back(E->get() + ":" + itos(E->key()));
 			r_functions->push_back(E->get() + ":" + itos(E->key()));