summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2015-11-23 19:07:32 +0100
committerRémi Verschelde <rverschelde@gmail.com>2015-11-23 19:08:54 +0100
commita961347d8c9e1808e80da5b996cd7ab929f5eabb (patch)
tree0185bacf616c80a4a552717638d046c6af86155c
parent19a8f9b74d9ef7a4e2e9f5b1d1333995e2384943 (diff)
Fix return type of Matrix32 member vars
Thanks to @bojidar-bg for localising the issue.
-rw-r--r--core/variant_op.cpp6
-rw-r--r--doc/base/classes.xml6
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&amp;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>