From 5be9ff7b6715a661e85f99b108f96340de7ef435 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 1 Jan 2016 11:50:53 -0200 Subject: Update copyright to 2016 in headers --- tools/doc/doc_data.cpp | 2 +- tools/doc/doc_data.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/doc') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 3161e380b9..96fd3f6b68 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-2015 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 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 */ diff --git a/tools/doc/doc_data.h b/tools/doc/doc_data.h index b62eb21b4a..877f30defb 100644 --- a/tools/doc/doc_data.h +++ b/tools/doc/doc_data.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 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 23441ec8676f6d804692fe1e49e7fea2bec55341 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 2 Jan 2016 21:07:03 -0300 Subject: Added var2bytes and bytes2var to convet any variable to bytes and back. Closes #2075 --- tools/doc/doc_data.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/doc') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 96fd3f6b68..a039c58ff4 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -584,7 +584,10 @@ void DocData::generate(bool p_basic_types) { md.name=mi.name; if (mi.return_val.name!="") md.return_type=mi.return_val.name; - else + else if (mi.name.find(":")!=-1) { + md.return_type=mi.name.get_slice(":",1); + md.name=mi.name.get_slice(":",0); + } else md.return_type=Variant::get_type_name(mi.return_val.type); for(int i=0;i Date: Fri, 8 Jan 2016 17:54:35 -0300 Subject: fixes debug_release build --- tools/doc/doc_data.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/doc') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index a039c58ff4..11e4797747 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -190,10 +190,10 @@ void DocData::generate(bool p_basic_types) { #ifdef DEBUG_METHODS_ENABLED if (m && m->get_return_type()!=StringName()) method.return_type=m->get_return_type(); - else if (arginfo.type!=Variant::NIL) { + else if (arginfo.type!=Variant::NIL) // { #endif method.return_type=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type); - } +// } } else { -- cgit v1.2.3