godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #96076 from AThousandShips/improve_null_check_core_drivers

Browse Source 
[Core,Drivers] Improve use of `Ref.is_null/valid`
This commit is contained in:
Thaddeus Crews
2024-12-23 11:14:58 -06:00
parent 0c80b47ef0 ec650a2f09
commit 3c304ab7cc
14 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/object.cpp
View File

@@ -939,7 +939,7 @@ void Object::set_script(const Variant &p_script) {
script_instance = nullptr;
}
if (!s.is_null()) {
if (s.is_valid()) {
if (s->can_instantiate()) {
OBJ_DEBUG_LOCK
script_instance = s->instance_create(this);
@@ -1578,7 +1578,7 @@ void Object::_clear_internal_resource_paths(const Variant &p_var) {
switch (p_var.get_type()) {
case Variant::OBJECT: {
Ref<Resource> r = p_var;
if (!r.is_valid()) {
if (r.is_null()) {
return;
}