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/visual_instance.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scene/3d/visual_instance.cpp') diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 7d61006529..b9e4488998 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -57,16 +57,16 @@ void VisualInstance::_notification(int p_what) { // CHECK ROOM Spatial *parent = get_parent_spatial(); Room *room = NULL; - bool is_geom = cast_to(); + bool is_geom = Object::cast_to(this); /* while(parent) { - room = parent->cast_to(); + room = Object::cast_to(parent); if (room) break; - if (is_geom && parent->cast_to()) { - VS::get_singleton()->instance_geometry_set_baked_light_sampler(get_instance(),parent->cast_to()->get_instance()); + if (is_geom && Object::cast_to(parent)) { + VS::get_singleton()->instance_geometry_set_baked_light_sampler(get_instance(),Object::cast_to(parent)->get_instance()); break; } @@ -79,7 +79,7 @@ void VisualInstance::_notification(int p_what) { } // CHECK SKELETON => moving skeleton attaching logic to MeshInstance /* - Skeleton *skeleton=get_parent()?get_parent()->cast_to():NULL; + Skeleton *skeleton=Object::cast_to(get_parent()); if (skeleton) VisualServer::get_singleton()->instance_attach_skeleton( instance, skeleton->get_skeleton() ); */ -- cgit v1.2.3