diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-04-07 19:42:11 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-04-07 19:43:09 -0300 |
| commit | 9e7cee2ceb1a963c1da2c21013adf7d616412d3c (patch) | |
| tree | 435be344798e92761c97da8295f1a97bcec051e0 /scene/main/canvas_layer.h | |
| parent | cd7e9d964281d700de691eb48eb4b597c8fd947a (diff) | |
| download | redot-engine-9e7cee2ceb1a963c1da2c21013adf7d616412d3c.tar.gz | |
Removed strange custom world2d in CanvasLayer, been there since always and not sure why.
Fixes #17524, fixes #17523.
Diffstat (limited to 'scene/main/canvas_layer.h')
| -rw-r--r-- | scene/main/canvas_layer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index c3352a6dba..aae23fbb12 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -45,7 +45,7 @@ class CanvasLayer : public Node { real_t rot; int layer; Transform2D transform; - Ref<World2D> canvas; + RID canvas; ObjectID custom_viewport_id; // to check validity Viewport *custom_viewport; @@ -81,8 +81,6 @@ public: void set_scale(const Size2 &p_scale); Size2 get_scale() const; - Ref<World2D> get_world_2d() const; - Size2 get_viewport_size() const; RID get_viewport() const; @@ -93,7 +91,10 @@ public: void reset_sort_index(); int get_sort_index(); + RID get_canvas() const; + CanvasLayer(); + ~CanvasLayer(); }; #endif // CANVAS_LAYER_H |