diff options
| author | Gilles Roudière <gilles.roudiere@gmail.com> | 2018-04-24 11:33:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 11:33:49 +0200 |
| commit | 2e8dda1f3f1325337504c433d6625bec1f380838 (patch) | |
| tree | c7562793f2ff7954f38f3c4ea00271ca0e9d64a1 /scene/2d/node_2d.cpp | |
| parent | 1c419531a009f48aa074f9b5f93b98d387c33723 (diff) | |
| parent | 8619b0d2801b74d258c553f6dcda58e086a1a50c (diff) | |
Merge pull request #18391 from endragor/fix-global-position-type
Fix Node2D::global_position to have Vector2 type
Diffstat (limited to 'scene/2d/node_2d.cpp')
| -rw-r--r-- | scene/2d/node_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 2a52ade01d..f8cec72400 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -448,7 +448,7 @@ void Node2D::_bind_methods() { ADD_PROPERTYNO(PropertyInfo(Variant::VECTOR2, "scale"), "set_scale", "get_scale"); ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "transform", PROPERTY_HINT_NONE, "", 0), "set_transform", "get_transform"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "global_position", PROPERTY_HINT_NONE, "", 0), "set_global_position", "get_global_position"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "global_position", PROPERTY_HINT_NONE, "", 0), "set_global_position", "get_global_position"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "global_rotation", PROPERTY_HINT_NONE, "", 0), "set_global_rotation", "get_global_rotation"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "global_rotation_degrees", PROPERTY_HINT_NONE, "", 0), "set_global_rotation_degrees", "get_global_rotation_degrees"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "global_scale", PROPERTY_HINT_NONE, "", 0), "set_global_scale", "get_global_scale"); |