You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-07 12:30:27 +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:
@@ -626,12 +626,12 @@ void TextureRegionEditor::edit(Object *p_obj) {
|
||||
if (atlas_tex.is_valid())
|
||||
atlas_tex->remove_change_receptor(this);
|
||||
if (p_obj) {
|
||||
node_sprite = p_obj->cast_to<Sprite>();
|
||||
node_patch9 = p_obj->cast_to<NinePatchRect>();
|
||||
if (p_obj->cast_to<StyleBoxTexture>())
|
||||
obj_styleBox = Ref<StyleBoxTexture>(p_obj->cast_to<StyleBoxTexture>());
|
||||
if (p_obj->cast_to<AtlasTexture>())
|
||||
atlas_tex = Ref<AtlasTexture>(p_obj->cast_to<AtlasTexture>());
|
||||
node_sprite = Object::cast_to<Sprite>(p_obj);
|
||||
node_patch9 = Object::cast_to<NinePatchRect>(p_obj);
|
||||
if (Object::cast_to<StyleBoxTexture>(p_obj))
|
||||
obj_styleBox = Ref<StyleBoxTexture>(Object::cast_to<StyleBoxTexture>(p_obj));
|
||||
if (Object::cast_to<AtlasTexture>(p_obj))
|
||||
atlas_tex = Ref<AtlasTexture>(Object::cast_to<AtlasTexture>(p_obj));
|
||||
p_obj->add_change_receptor(this);
|
||||
_edit_region();
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user