summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Etcheverry <ignalfonsore@gmail.com>2016-05-04 15:04:12 +0200
committerIgnacio Etcheverry <ignalfonsore@gmail.com>2016-05-04 15:16:24 +0200
commit2060e6616cb39362cddc3c57a94292896f9f4525 (patch)
treed1a9ee5aa3b79a63348f12520db220082b4298a9
parent479cfb1d361bcf1863d69a464ed404efa7fe3b40 (diff)
Add missing Vector2Array case to Variant::operator String()
- Correcly display Vector2Array default arguments in the documentation
-rw-r--r--core/variant.cpp12
-rw-r--r--tools/doc/doc_data.cpp1
2 files changed, 13 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp
index 527a0d238f..ea5a378ad0 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1556,6 +1556,18 @@ Variant::operator String() const {
return str;
} break;
+ case VECTOR2_ARRAY: {
+
+ DVector<Vector2> vec = operator DVector<Vector2>();
+ String str;
+ for(int i=0;i<vec.size();i++) {
+
+ if (i>0)
+ str+=", ";
+ str=str+Variant( vec[i] );
+ }
+ return str;
+ } break;
case VECTOR3_ARRAY: {
DVector<Vector3> vec = operator DVector<Vector3>();
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 2d0d7617c2..0bf69c1cdd 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -267,6 +267,7 @@ void DocData::generate(bool p_basic_types) {
case Variant::INT_ARRAY:
case Variant::REAL_ARRAY:
case Variant::STRING_ARRAY: //25
+ case Variant::VECTOR2_ARRAY:
case Variant::VECTOR3_ARRAY:
case Variant::COLOR_ARRAY:
default_arg_text=Variant::get_type_name(default_arg.get_type())+"("+default_arg_text+")";