From cacced7e507f7603bacc03ae2616e58f0ede122a Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Thu, 24 Aug 2017 22:58:51 +0200 Subject: Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/ --- scene/3d/room_instance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/3d/room_instance.cpp') diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp index c5ea6c54d..3e6a8d3c3 100644 --- a/scene/3d/room_instance.cpp +++ b/scene/3d/room_instance.cpp @@ -45,7 +45,7 @@ void Room::_notification(int p_what) { while (parent_room) { - Room *r = parent_room->cast_to(); + Room *r = Object::cast_to(parent_room); if (r) { level = r->level + 1; @@ -103,7 +103,7 @@ Ref Room::get_room() const { void Room::_parse_node_faces(PoolVector &all_faces, const Node *p_node) const { - const VisualInstance *vi = p_node->cast_to(); + const VisualInstance *vi = Object::cast_to(p_node); if (vi) { PoolVector faces = vi->get_faces(FACES_ENCLOSING); -- cgit v1.3.1