You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
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/
This commit is contained in:
@@ -269,9 +269,9 @@ PathSpatialGizmo::PathSpatialGizmo(Path *p_path) {
|
||||
|
||||
Ref<SpatialEditorGizmo> PathEditorPlugin::create_spatial_gizmo(Spatial *p_spatial) {
|
||||
|
||||
if (p_spatial->cast_to<Path>()) {
|
||||
if (Object::cast_to<Path>(p_spatial)) {
|
||||
|
||||
return memnew(PathSpatialGizmo(p_spatial->cast_to<Path>()));
|
||||
return memnew(PathSpatialGizmo(Object::cast_to<Path>(p_spatial)));
|
||||
}
|
||||
|
||||
return Ref<SpatialEditorGizmo>();
|
||||
@@ -433,7 +433,7 @@ bool PathEditorPlugin::forward_spatial_gui_input(Camera *p_camera, const Ref<Inp
|
||||
void PathEditorPlugin::edit(Object *p_object) {
|
||||
|
||||
if (p_object) {
|
||||
path = p_object->cast_to<Path>();
|
||||
path = Object::cast_to<Path>(p_object);
|
||||
if (path) {
|
||||
|
||||
if (path->get_curve().is_valid()) {
|
||||
@@ -447,7 +447,7 @@ void PathEditorPlugin::edit(Object *p_object) {
|
||||
pre->get_curve()->emit_signal("changed");
|
||||
}
|
||||
}
|
||||
//collision_polygon_editor->edit(p_object->cast_to<Node>());
|
||||
//collision_polygon_editor->edit(Object::cast_to<Node>(p_object));
|
||||
}
|
||||
|
||||
bool PathEditorPlugin::handles(Object *p_object) const {
|
||||
|
||||
Reference in New Issue
Block a user