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/character_camera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene/3d/character_camera.cpp') diff --git a/scene/3d/character_camera.cpp b/scene/3d/character_camera.cpp index ce047f91c..9feda1b72 100644 --- a/scene/3d/character_camera.cpp +++ b/scene/3d/character_camera.cpp @@ -369,7 +369,7 @@ void CharacterCamera::_notification(int p_what) { Node* parent = get_parent(); while (parent) { - PhysicsBody* p = parent->cast_to(); + PhysicsBody* p = Object::cast_to(parent); if (p) { target_body = p->get_body(); break; -- cgit v1.3.1