From fdaa2920eb21fff3320a17e9239e04dfadecdb00 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 18 Apr 2015 14:38:54 -0300 Subject: Updated copyright year in all headers --- tools/doc/doc_data.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/doc/doc_data.cpp') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 75759e7d30..c278662db2 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ -- cgit v1.2.3 From 66c71c21df55395adb8938dcd9c03fa3fae0043b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 22 Apr 2015 00:25:13 -0300 Subject: resolved some cases wehre built-in doc is not properlt generated, fixes #1719 --- tools/doc/doc_data.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tools/doc/doc_data.cpp') 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; -- cgit v1.2.3