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/ --- editor/plugins/texture_region_editor_plugin.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'editor/plugins/texture_region_editor_plugin.cpp') diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index d878bba42..d9e310a58 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -626,12 +626,12 @@ void TextureRegionEditor::edit(Object *p_obj) { if (atlas_tex.is_valid()) atlas_tex->remove_change_receptor(this); if (p_obj) { - node_sprite = p_obj->cast_to(); - node_patch9 = p_obj->cast_to(); - if (p_obj->cast_to()) - obj_styleBox = Ref(p_obj->cast_to()); - if (p_obj->cast_to()) - atlas_tex = Ref(p_obj->cast_to()); + node_sprite = Object::cast_to(p_obj); + node_patch9 = Object::cast_to(p_obj); + if (Object::cast_to(p_obj)) + obj_styleBox = Ref(Object::cast_to(p_obj)); + if (Object::cast_to(p_obj)) + atlas_tex = Ref(Object::cast_to(p_obj)); p_obj->add_change_receptor(this); _edit_region(); } else { -- cgit v1.2.3-70-g09d2