diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2016-09-20 09:28:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 09:28:26 +0200 |
| commit | 1c50dfdf6c352574391c953d88732382adc15e83 (patch) | |
| tree | f719805d251e51d8dd87e12d35318e512601a177 /scene/main | |
| parent | 82f5130cad04c2a959a87ea0bca63e82454fa3cf (diff) | |
| parent | aa5ade834c8646b81e2320089314393c00ee8020 (diff) | |
Merge pull request #6557 from anneomcl/master
Fix for #6158
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/canvas_layer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index 6aad90a09d..a1311390be 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -40,7 +40,7 @@ class CanvasLayer : public Node { bool locrotscale_dirty; Vector2 ofs; - Vector2 scale; + Size2 scale; real_t rot; int layer; Matrix32 transform; @@ -81,8 +81,8 @@ public: void set_rotationd(real_t p_degrees); real_t get_rotationd() const; - void set_scale(const Vector2& p_scale); - Vector2 get_scale() const; + void set_scale(const Size2& p_scale); + Size2 get_scale() const; Ref<World2D> get_world_2d() const; |