diff options
| author | Ignacio Etcheverry | 2016-05-04 15:04:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-05-06 11:13:25 +0200 |
| commit | 975b4d2927967f28cb2a4692ca7b64ee57d5e050 (patch) | |
| tree | 619330ef1e844f2bbc705fd99640408f36215e2a | |
| parent | 913818a246257f4a568147e58ee90cb232ff9388 (diff) | |
| download | godot-975b4d2927967f28cb2a4692ca7b64ee57d5e050.tar.gz godot-975b4d2927967f28cb2a4692ca7b64ee57d5e050.tar.zst godot-975b4d2927967f28cb2a4692ca7b64ee57d5e050.zip | |
Add missing Vector2Array case to Variant::operator String()
- Correcly display Vector2Array default arguments in the documentation
(cherry picked from commit 2060e6616cb39362cddc3c57a94292896f9f4525)
| -rw-r--r-- | core/variant.cpp | 12 | ||||
| -rw-r--r-- | tools/doc/doc_data.cpp | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 527a0d238..ea5a378ad 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 1d9e964a6..437af7f1d 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -283,6 +283,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+")"; |
