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.cpp | |
| 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.cpp')
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index 60530e48e..b163402a0 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -102,9 +102,9 @@ void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transfor } if (ci->z_relative) - p_z = CLAMP(p_z + ci->z, VS::CANVAS_ITEM_Z_MIN, VS::CANVAS_ITEM_Z_MAX); + p_z = CLAMP(p_z + ci->z_index, VS::CANVAS_ITEM_Z_MIN, VS::CANVAS_ITEM_Z_MAX); else - p_z = ci->z; + p_z = ci->z_index; for (int i = 0; i < child_item_count; i++) { @@ -805,14 +805,14 @@ void VisualServerCanvas::canvas_item_set_sort_children_by_y(RID p_item, bool p_e canvas_item->sort_y = p_enable; } -void VisualServerCanvas::canvas_item_set_z(RID p_item, int p_z) { +void VisualServerCanvas::canvas_item_set_z_index(RID p_item, int p_z) { ERR_FAIL_COND(p_z < VS::CANVAS_ITEM_Z_MIN || p_z > VS::CANVAS_ITEM_Z_MAX); Item *canvas_item = canvas_item_owner.getornull(p_item); ERR_FAIL_COND(!canvas_item); - canvas_item->z = p_z; + canvas_item->z_index = p_z; } void VisualServerCanvas::canvas_item_set_z_as_relative_to_parent(RID p_item, bool p_enable) { |