diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-05 17:55:43 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 17:55:43 -0300 |
| commit | 435bedd9ef58817926bb0e7df9586e1d137b761b (patch) | |
| tree | 59d2481db7928cb4b963686c039f1239d35c5686 /scene/2d/node_2d.h | |
| parent | 52649f10380d64e4d979fffe5f000b3d3609d549 (diff) | |
| parent | e82270e8d05dec7d7c679455f30c3ea5d634120c (diff) | |
| download | redot-engine-435bedd9ef58817926bb0e7df9586e1d137b761b.tar.gz | |
Merge pull request #10116 from neikeq/prop_method_ambiguities
Renames properties and methods to avoid ambiguities
Diffstat (limited to 'scene/2d/node_2d.h')
| -rw-r--r-- | scene/2d/node_2d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h index 5b3a28d5c3..df9a05ff79 100644 --- a/scene/2d/node_2d.h +++ b/scene/2d/node_2d.h @@ -78,7 +78,7 @@ public: void move_y(float p_delta, bool p_scaled = false); void translate(const Vector2 &p_amount); void global_translate(const Vector2 &p_amount); - void scale(const Size2 &p_amount); + void apply_scale(const Size2 &p_amount); Point2 get_position() const; float get_rotation() const; |