diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-24 00:10:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-24 00:10:18 +0100 |
| commit | 1ac7d4fc77e6157a8db78aa3c9f82342f72c5bb7 (patch) | |
| tree | fb36e18bc953033bd28cf99c04c622aeb5a2e4d6 | |
| parent | 17a97b7bdfbf556e218103d476c3e31a4f1c0be7 (diff) | |
| parent | a961347d8c9e1808e80da5b996cd7ab929f5eabb (diff) | |
Merge pull request #2889 from akien-mga/pr-matrix32-members
Fix return type of Matrix32 member vars
| -rw-r--r-- | core/variant_op.cpp | 6 | ||||
| -rw-r--r-- | doc/base/classes.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index eabd647837..1bcfa7d2ae 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -2818,9 +2818,9 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const { } break; case MATRIX32: { - p_list->push_back( PropertyInfo(Variant::REAL,"x")); - p_list->push_back( PropertyInfo(Variant::REAL,"y")); - p_list->push_back( PropertyInfo(Variant::REAL,"o")); + p_list->push_back( PropertyInfo(Variant::VECTOR2,"x")); + p_list->push_back( PropertyInfo(Variant::VECTOR2,"y")); + p_list->push_back( PropertyInfo(Variant::VECTOR2,"o")); } break; case PLANE: { diff --git a/doc/base/classes.xml b/doc/base/classes.xml index a26458a14f..aa310b15c9 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -16735,11 +16735,11 @@ returns:= "username=user&password=pass" </method> </methods> <members> - <member name="x" type="float"> + <member name="x" type="Vector2"> </member> - <member name="y" type="float"> + <member name="y" type="Vector2"> </member> - <member name="o" type="float"> + <member name="o" type="Vector2"> </member> </members> <constants> |