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

resolved some cases wehre built-in doc is not properlt generated, fixes #1719

This commit is contained in:
Juan Linietsky 2015-04-22 00:25:13 -03:00
parent 8aab677906
commit 66c71c21df
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant_call.cpp
View File

@ -1112,6 +1112,7 @@ void Variant::get_constructor_list(Variant::Type p_type, List<MethodInfo> *p_lis
const _VariantCall::ConstructData &cd = E->get(); const _VariantCall::ConstructData &cd = E->get();
MethodInfo mi; MethodInfo mi;
mi.name=Variant::get_type_name(p_type); mi.name=Variant::get_type_name(p_type);
mi.return_val.type=p_type;
for(int i=0;i<cd.arg_count;i++) { for(int i=0;i<cd.arg_count;i++) {
PropertyInfo pi; PropertyInfo pi;
@ -1134,6 +1135,7 @@ void Variant::get_constructor_list(Variant::Type p_type, List<MethodInfo> *p_lis
pi.name="from"; pi.name="from";
pi.type=Variant::Type(i); pi.type=Variant::Type(i);
mi.arguments.push_back(pi); mi.arguments.push_back(pi);
mi.return_val.type=p_type;
p_list->push_back(mi); p_list->push_back(mi);
} }
} }

3
tools/doc/doc_data.cpp
View File

@ -59,6 +59,9 @@ void DocData::merge_from(const DocData& p_data) {
if (cf.methods[j].name!=m.name) if (cf.methods[j].name!=m.name)
continue; continue;
if (cf.methods[j].arguments.size()!=m.arguments.size())
continue;
const MethodDoc &mf = cf.methods[j]; const MethodDoc &mf = cf.methods[j];
m.description=mf.description; m.description=mf.description;