diff options
| author | Hein-Pieter van Braam | 2017-08-24 22:58:51 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2017-08-24 23:08:24 +0200 |
| commit | cacced7e507f7603bacc03ae2616e58f0ede122a (patch) | |
| tree | 7af89373e86cd1a7af6ea04e10280084cabb7144 /editor/plugins/multimesh_editor_plugin.cpp | |
| parent | 4aa2c18cb428ffde05c67987926736a9ca62703b (diff) | |
| download | godot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.gz godot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.zst godot-cacced7e507f7603bacc03ae2616e58f0ede122a.zip | |
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/
Diffstat (limited to 'editor/plugins/multimesh_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/multimesh_editor_plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index a9689cce5..6ecb49b16 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -77,7 +77,7 @@ void MultiMeshEditor::_populate() { return; } - MeshInstance *ms_instance = ms_node->cast_to<MeshInstance>(); + MeshInstance *ms_instance = Object::cast_to<MeshInstance>(ms_node); if (!ms_instance) { @@ -112,7 +112,7 @@ void MultiMeshEditor::_populate() { return; } - GeometryInstance *ss_instance = ss_node->cast_to<MeshInstance>(); + GeometryInstance *ss_instance = Object::cast_to<MeshInstance>(ss_node); if (!ss_instance) { @@ -155,7 +155,7 @@ void MultiMeshEditor::_populate() { ERR_EXPLAIN("Multimesh not present."); ERR_FAIL_COND(multimesh.is_null()); - VisualInstance *vi = get_parent()->cast_to<VisualInstance>(); + VisualInstance *vi = Object::cast_to<VisualInstance>(get_parent()); ERR_EXPLAIN("Parent is not of type VisualInstance, can't be populated."); ERR_FAIL_COND(!vi); @@ -402,7 +402,7 @@ MultiMeshEditor::MultiMeshEditor() { void MultiMeshEditorPlugin::edit(Object *p_object) { - multimesh_editor->edit(p_object->cast_to<MultiMeshInstance>()); + multimesh_editor->edit(Object::cast_to<MultiMeshInstance>(p_object)); } bool MultiMeshEditorPlugin::handles(Object *p_object) const { |
