diff options
| author | Rémi Verschelde | 2018-01-04 00:41:45 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-04 00:41:45 +0100 |
| commit | f9f6f250e68853dc0b3ab397145b8c060e1cb110 (patch) | |
| tree | 44ccf761daa04e0a96b7610d064bac3359387b80 /servers/visual/visual_server_canvas.h | |
| parent | 66d541c69db95fc7951bc587b20b7a4a93e955d2 (diff) | |
| parent | 42ae3525a3adfc9518361aab5625d7ff76e97623 (diff) | |
| download | godot-f9f6f250e68853dc0b3ab397145b8c060e1cb110.tar.gz godot-f9f6f250e68853dc0b3ab397145b8c060e1cb110.tar.zst godot-f9f6f250e68853dc0b3ab397145b8c060e1cb110.zip | |
Merge pull request #15191 from Jerome67000/z_renaming
renames "z" Node2D property to "z_index"
Diffstat (limited to 'servers/visual/visual_server_canvas.h')
| -rw-r--r-- | servers/visual/visual_server_canvas.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/visual/visual_server_canvas.h b/servers/visual/visual_server_canvas.h index b86dd0316..320fc2fb0 100644 --- a/servers/visual/visual_server_canvas.h +++ b/servers/visual/visual_server_canvas.h @@ -39,7 +39,7 @@ public: RID parent; // canvas it belongs to List<Item *>::Element *E; - int z; + int z_index; bool z_relative; bool sort_y; Color modulate; @@ -53,7 +53,7 @@ public: Item() { children_order_dirty = true; E = NULL; - z = 0; + z_index = 0; modulate = Color(1, 1, 1, 1); self_modulate = Color(1, 1, 1, 1); sort_y = false; @@ -187,7 +187,7 @@ public: void canvas_item_add_set_transform(RID p_item, const Transform2D &p_transform); void canvas_item_add_clip_ignore(RID p_item, bool p_ignore); void canvas_item_set_sort_children_by_y(RID p_item, bool p_enable); - void canvas_item_set_z(RID p_item, int p_z); + void canvas_item_set_z_index(RID p_item, int p_z); void canvas_item_set_z_as_relative_to_parent(RID p_item, bool p_enable); void canvas_item_set_copy_to_backbuffer(RID p_item, bool p_enable, const Rect2 &p_rect); |