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/mesh_instance_editor_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'editor/plugins/mesh_instance_editor_plugin.cpp') diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index 49498d0fa..06fca06ba 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -101,7 +101,7 @@ void MeshInstanceEditor::_menu_option(int p_option) { for (List::Element *E = selection.front(); E; E = E->next()) { - MeshInstance *instance = E->get()->cast_to(); + MeshInstance *instance = Object::cast_to(E->get()); if (!instance) continue; @@ -290,7 +290,7 @@ MeshInstanceEditor::MeshInstanceEditor() { void MeshInstanceEditorPlugin::edit(Object *p_object) { - mesh_editor->edit(p_object->cast_to()); + mesh_editor->edit(Object::cast_to(p_object)); } bool MeshInstanceEditorPlugin::handles(Object *p_object) const { -- cgit v1.2.3-70-g09d2