northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert Object::cast_to() to the static version

Browse Source 
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:
Hein-Pieter van Braam
2017-08-24 22:58:51 +02:00
parent 4aa2c18cb4
commit cacced7e50
185 changed files with 1314 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/3d/visual_instance.cpp
View File

@ -57,16 +57,16 @@ void VisualInstance::_notification(int p_what) {
// CHECK ROOM
Spatial *parent = get_parent_spatial();
Room *room = NULL;
bool is_geom = cast_to<GeometryInstance>();
bool is_geom = Object::cast_to<GeometryInstance>(this);
/* while(parent) {
room = parent->cast_to<Room>();
room = Object::cast_to<Room>(parent);
if (room)
break;
if (is_geom && parent->cast_to<BakedLightSampler>()) {
VS::get_singleton()->instance_geometry_set_baked_light_sampler(get_instance(),parent->cast_to<BakedLightSampler>()->get_instance());
if (is_geom && Object::cast_to<BakedLightSampler>(parent)) {
VS::get_singleton()->instance_geometry_set_baked_light_sampler(get_instance(),Object::cast_to<BakedLightSampler>(parent)->get_instance());
break;
}
@ -79,7 +79,7 @@ void VisualInstance::_notification(int p_what) {
}
// CHECK SKELETON => moving skeleton attaching logic to MeshInstance
/*
Skeleton *skeleton=get_parent()?get_parent()->cast_to<Skeleton>():NULL;
Skeleton *skeleton=Object::cast_to<Skeleton>(get_parent());
if (skeleton)
VisualServer::get_singleton()->instance_attach_skeleton( instance, skeleton->get_skeleton() );
*/