diff options
| author | jfons <joan.fonssanchez@gmail.com> | 2021-06-09 13:06:38 +0200 |
|---|---|---|
| committer | jfons <joan.fonssanchez@gmail.com> | 2021-06-14 14:05:13 +0200 |
| commit | ee702334a1c7bd19dd8fd7fd57009e393939bab7 (patch) | |
| tree | cf4e0ece2f10a1c0d5f89d6e1d0e532406fefc6e /scene | |
| parent | f178e7abd7d0af21d326f2e818bcd07a487b19fe (diff) | |
Rename get_parent_spatial() to get_parent_node3d()
Renames get_parent_spatial() to get_parent_node3d() and changes its
implementation. Before it was not returning a correct pointer if the
node wasn't added to a SceneTree. Now it uses the same implementation as
CanvasItem, which will be correct even for nodes outside a SceneTree.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/node_3d.cpp | 10 | ||||
| -rw-r--r-- | scene/3d/node_3d.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index e96e4df55c..f1fd80617d 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -282,8 +282,12 @@ Transform3D Node3D::get_local_gizmo_transform() const { } #endif -Node3D *Node3D::get_parent_spatial() const { - return data.parent; +Node3D *Node3D::get_parent_node_3d() const { + if (data.top_level) { + return nullptr; + } + + return Object::cast_to<Node3D>(get_parent()); } Transform3D Node3D::get_relative_transform(const Node *p_parent) const { @@ -703,7 +707,7 @@ void Node3D::_bind_methods() { ClassDB::bind_method(D_METHOD("get_scale"), &Node3D::get_scale); ClassDB::bind_method(D_METHOD("set_global_transform", "global"), &Node3D::set_global_transform); ClassDB::bind_method(D_METHOD("get_global_transform"), &Node3D::get_global_transform); - ClassDB::bind_method(D_METHOD("get_parent_spatial"), &Node3D::get_parent_spatial); + ClassDB::bind_method(D_METHOD("get_parent_node_3d"), &Node3D::get_parent_node_3d); ClassDB::bind_method(D_METHOD("set_ignore_transform_notification", "enabled"), &Node3D::set_ignore_transform_notification); ClassDB::bind_method(D_METHOD("set_as_top_level", "enable"), &Node3D::set_as_top_level); ClassDB::bind_method(D_METHOD("is_set_as_top_level"), &Node3D::is_set_as_top_level); diff --git a/scene/3d/node_3d.h b/scene/3d/node_3d.h index 09a96bf8ca..4accc95cfa 100644 --- a/scene/3d/node_3d.h +++ b/scene/3d/node_3d.h @@ -118,7 +118,7 @@ public: NOTIFICATION_LOCAL_TRANSFORM_CHANGED = 44, }; - Node3D *get_parent_spatial() const; + Node3D *get_parent_node_3d() const; Ref<World3D> get_world_3d() const; |