diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-04 00:41:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 00:41:45 +0100 |
| commit | f9f6f250e68853dc0b3ab397145b8c060e1cb110 (patch) | |
| tree | 44ccf761daa04e0a96b7610d064bac3359387b80 /editor/plugins | |
| parent | 66d541c69db95fc7951bc587b20b7a4a93e955d2 (diff) | |
| parent | 42ae3525a3adfc9518361aab5625d7ff76e97623 (diff) | |
Merge pull request #15191 from Jerome67000/z_renaming
renames "z" Node2D property to "z_index"
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 052817f40a..a52c914096 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -641,7 +641,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_no _SelectResult res; res.item = c; - res.z = node ? node->get_z() : 0; + res.z_index = node ? node->get_z_index() : 0; res.has_z = node; r_items.push_back(res); } diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index f14f1a92a6..0866fe77aa 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -252,10 +252,10 @@ class CanvasItemEditor : public VBoxContainer { struct _SelectResult { CanvasItem *item; - float z; + float z_index; bool has_z; _FORCE_INLINE_ bool operator<(const _SelectResult &p_rr) const { - return has_z && p_rr.has_z ? p_rr.z < z : p_rr.has_z; + return has_z && p_rr.has_z ? p_rr.z_index < z_index : p_rr.has_z; } }; |