summaryrefslogtreecommitdiff
path: root/tools/doc
diff options
context:
space:
mode:
authorIgnacio Etcheverry <neikeq@users.noreply.github.com>2016-08-26 19:48:42 +0200
committerGitHub <noreply@github.com>2016-08-26 19:48:42 +0200
commit45902931863a6389736749f825aab060b4bc7e04 (patch)
treedcbe20b2d76218b11e028631ee695097220e2416 /tools/doc
parent9c6175db11ff72603ae58789a462b33ec1e910f8 (diff)
parentb81725b203cfceefd8577cf2ec4ca9dd0d618869 (diff)
Merge pull request #6269 from neikeq/pr-doc-null
DocData: Fix null reference not detected correctly
Diffstat (limited to 'tools/doc')
-rw-r--r--tools/doc/doc_data.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index ce69aca0c6..479b99a03d 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -296,6 +296,10 @@ void DocData::generate(bool p_basic_types) {
default_arg_text=Variant::get_type_name(default_arg.get_type())+default_arg_text;
break;
case Variant::OBJECT:
+ if (default_arg.is_zero()) {
+ default_arg_text="NULL";
+ break;
+ }
case Variant::INPUT_EVENT:
case Variant::DICTIONARY: // 20
case Variant::ARRAY: