summaryrefslogtreecommitdiffstats
path: root/scene/2d/collision_shape_2d.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-01-04 00:41:45 +0100
committerGitHub <noreply@github.com>2018-01-04 00:41:45 +0100
commitf9f6f250e68853dc0b3ab397145b8c060e1cb110 (patch)
tree44ccf761daa04e0a96b7610d064bac3359387b80 /scene/2d/collision_shape_2d.cpp
parent66d541c69db95fc7951bc587b20b7a4a93e955d2 (diff)
parent42ae3525a3adfc9518361aab5625d7ff76e97623 (diff)
downloadredot-engine-f9f6f250e68853dc0b3ab397145b8c060e1cb110.tar.gz
Merge pull request #15191 from Jerome67000/z_renaming
renames "z" Node2D property to "z_index"
Diffstat (limited to 'scene/2d/collision_shape_2d.cpp')
-rw-r--r--scene/2d/collision_shape_2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp
index 135ede829d..1956e23421 100644
--- a/scene/2d/collision_shape_2d.cpp
+++ b/scene/2d/collision_shape_2d.cpp
@@ -64,7 +64,7 @@ void CollisionShape2D::_notification(int p_what) {
/*if (Engine::get_singleton()->is_editor_hint()) {
//display above all else
set_z_as_relative(false);
- set_z(VS::CANVAS_ITEM_Z_MAX - 1);
+ set_z_index(VS::CANVAS_ITEM_Z_MAX - 1);
}*/
} break;