diff options
| author | Rémi Verschelde | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /scene/main/canvas_layer.h | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
| download | godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.zst godot-3f3f5a5359973e95e94148676a9793d6f52468f3.zip | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'scene/main/canvas_layer.h')
| -rw-r--r-- | scene/main/canvas_layer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index 039db8823..2e3c91720 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -52,6 +52,8 @@ class CanvasLayer : public Node { RID viewport; Viewport *vp; + int sort_index; + // Deprecated, should be removed in a future version. void _set_rotationd(real_t p_rotation); real_t _get_rotationd() const; @@ -93,6 +95,9 @@ public: void set_custom_viewport(Node *p_viewport); Node* get_custom_viewport() const; + void reset_sort_index(); + int get_sort_index(); + CanvasLayer(); }; |