feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -85,7 +85,7 @@ Node *InstancePlaceholder::create_instance(bool p_replace, const Ref<PackedScene
|
|||
ps = ResourceLoader::load(path, "PackedScene");
|
||||
}
|
||||
|
||||
if (!ps.is_valid()) {
|
||||
if (ps.is_null()) {
|
||||
return nullptr;
|
||||
}
|
||||
Node *instance = ps->instantiate();
|
||||
|
|
@ -163,7 +163,7 @@ void InstancePlaceholder::set_value_on_instance(InstancePlaceholder *p_placehold
|
|||
switch (current_type) {
|
||||
case Variant::Type::NIL: {
|
||||
Ref<Resource> resource = p_set.value;
|
||||
if (placeholder_type != Variant::Type::NODE_PATH && !resource.is_valid()) {
|
||||
if (placeholder_type != Variant::Type::NODE_PATH && resource.is_null()) {
|
||||
break;
|
||||
}
|
||||
// If it's nil but we have a NodePath or a Resource, we guess what works.
|
||||
|
|
@ -245,7 +245,7 @@ Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) {
|
|||
}
|
||||
|
||||
return ret;
|
||||
};
|
||||
}
|
||||
|
||||
void InstancePlaceholder::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_stored_values", "with_order"), &InstancePlaceholder::get_stored_values, DEFVAL(false));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue