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/camera_editor_plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editor/plugins/camera_editor_plugin.cpp') diff --git a/editor/plugins/camera_editor_plugin.cpp b/editor/plugins/camera_editor_plugin.cpp index 8e625c4a7..18ee8d8db 100644 --- a/editor/plugins/camera_editor_plugin.cpp +++ b/editor/plugins/camera_editor_plugin.cpp @@ -97,8 +97,8 @@ CameraEditor::CameraEditor() { void CameraEditorPlugin::edit(Object *p_object) { - SpatialEditor::get_singleton()->set_can_preview(p_object->cast_to()); - //camera_editor->edit(p_object->cast_to()); + SpatialEditor::get_singleton()->set_can_preview(Object::cast_to(p_object)); + //camera_editor->edit(Object::cast_to(p_object)); } bool CameraEditorPlugin::handles(Object *p_object) const { @@ -109,7 +109,7 @@ bool CameraEditorPlugin::handles(Object *p_object) const { void CameraEditorPlugin::make_visible(bool p_visible) { if (p_visible) { - //SpatialEditor::get_singleton()->set_can_preview(p_object->cast_to()); + //SpatialEditor::get_singleton()->set_can_preview(Object::cast_to(p_object)); } else { SpatialEditor::get_singleton()->set_can_preview(NULL); } -- cgit v1.2.3-70-g09d2