diff options
| author | hurikhan | 2015-01-14 13:31:16 +0800 |
|---|---|---|
| committer | hurikhan | 2015-01-14 13:31:16 +0800 |
| commit | 8a30feebbe676ab922515b58d0deec2f95aa104c (patch) | |
| tree | 55a208d7835022f6b876b4e45d5a482fbd4bd83f /servers/visual_server.h | |
| parent | 2203ba5fe3f7cdca078dd557ec532b7f335d3670 (diff) | |
| parent | 9012cd408e240d6039120e56fdd47a0983890993 (diff) | |
| download | godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.gz godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.zst godot-8a30feebbe676ab922515b58d0deec2f95aa104c.zip | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'servers/visual_server.h')
| -rw-r--r-- | servers/visual_server.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/servers/visual_server.h b/servers/visual_server.h index 5edf333e6..5721e7acf 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -86,8 +86,9 @@ public: ARRAY_WEIGHTS_SIZE=4, MAX_PARTICLE_COLOR_PHASES=4, MAX_PARTICLE_ATTRACTORS=4, - CANVAS_ITEM_Z_MAX=1024, - CANVAS_ITEM_Z_DEFAULT=512, + CANVAS_ITEM_Z_MIN=-4096, + CANVAS_ITEM_Z_MAX=4096, + MAX_CURSORS = 8, @@ -985,6 +986,7 @@ public: virtual void canvas_item_add_clip_ignore(RID p_item, bool p_ignore)=0; virtual void canvas_item_set_sort_children_by_y(RID p_item, bool p_enable)=0; virtual void canvas_item_set_z(RID p_item, int p_z)=0; + virtual void canvas_item_set_z_as_relative_to_parent(RID p_item, bool p_enable)=0; virtual void canvas_item_clear(RID p_item)=0; virtual void canvas_item_raise(RID p_item)=0; |