summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-04-22 00:25:13 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-04-22 00:25:13 -0300
commit66c71c21df55395adb8938dcd9c03fa3fae0043b (patch)
tree6290c304280be9523b71d8dbc322af606d85abea
parent8aab677906d25952d74caf434897254f3e3e99b4 (diff)
resolved some cases wehre built-in doc is not properlt generated, fixes #1719
-rw-r--r--core/variant_call.cpp2
-rw-r--r--tools/doc/doc_data.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index ab0e1eeeeb..a024c0068a 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -1112,6 +1112,7 @@ void Variant::get_constructor_list(Variant::Type p_type, List<MethodInfo> *p_lis
const _VariantCall::ConstructData &cd = E->get();
MethodInfo mi;
mi.name=Variant::get_type_name(p_type);
+ mi.return_val.type=p_type;
for(int i=0;i<cd.arg_count;i++) {
PropertyInfo pi;
@@ -1134,6 +1135,7 @@ void Variant::get_constructor_list(Variant::Type p_type, List<MethodInfo> *p_lis
pi.name="from";
pi.type=Variant::Type(i);
mi.arguments.push_back(pi);
+ mi.return_val.type=p_type;
p_list->push_back(mi);
}
}
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index c278662db2..b3eb6b08f7 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -59,6 +59,9 @@ void DocData::merge_from(const DocData& p_data) {
if (cf.methods[j].name!=m.name)
continue;
+ if (cf.methods[j].arguments.size()!=m.arguments.size())
+ continue;
+
const MethodDoc &mf = cf.methods[j];
m.description=mf.description;