diff options
| author | Jerome67000 | 2017-12-29 23:06:03 +0100 |
|---|---|---|
| committer | Jérôme | 2018-01-03 13:02:26 +0100 |
| commit | 42ae3525a3adfc9518361aab5625d7ff76e97623 (patch) | |
| tree | 0b993bd9d2b174be583f83400bc115a651815806 /servers/visual/visual_server_canvas.cpp | |
| parent | 99960d929435423b25e9bfb55051af60edbfcca9 (diff) | |
| download | godot-42ae3525a3adfc9518361aab5625d7ff76e97623.tar.gz godot-42ae3525a3adfc9518361aab5625d7ff76e97623.tar.zst godot-42ae3525a3adfc9518361aab5625d7ff76e97623.zip | |
#15078 renamed "z" -> "z_index" property in Node2D
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 532546c5f..df563eda5 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) { |