diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
| commit | a7875c586af74302584544d777b189f4cb85c393 (patch) | |
| tree | f4929f77383d835b5be8b6e099b9db59000af610 /tools/doc/doc_data.cpp | |
| parent | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (diff) | |
| parent | 8c4dd8de3919b789eac1a0f030563008bdcd44f5 (diff) | |
| download | redot-engine-a7875c586af74302584544d777b189f4cb85c393.tar.gz | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'tools/doc/doc_data.cpp')
| -rw-r--r-- | tools/doc/doc_data.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index d13c7ea73c..75759e7d30 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -186,8 +186,10 @@ void DocData::generate(bool p_basic_types) { arginfo=E->get().return_val; if (arginfo.type==Variant::NIL) continue; - - method.return_type=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type); + if (m && m->get_return_type()!=StringName()) + method.return_type=m->get_return_type(); + else + method.return_type=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type); } else { |