Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #83498 from SaracenOne/mesh_unwrap_rules

Browse source 
Mesh instance UV2 unwrapping improvements
This commit is contained in:
Rémi Verschelde 2023-10-28 12:30:22 +02:00
commit fe64786a91
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 65 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editor/editor_node.cpp
View file

@ -1279,11 +1279,9 @@ void EditorNode::save_resource_as(const Ref<Resource> &p_resource, const String
return;
}
}
} else {
if (FileAccess::exists(path + ".import")) {
show_warning(TTR("This resource can't be saved because it was imported from another file. Make it unique first."));
return;
}
} else if (FileAccess::exists(path + ".import")) {
show_warning(TTR("This resource can't be saved because it was imported from another file. Make it unique first."));
return;
}
}
@ -4063,11 +4061,9 @@ bool EditorNode::is_resource_read_only(Ref<Resource> p_resource, bool p_foreign_
}
}
}
} else {
} else if (FileAccess::exists(path + ".import")) {
// The resource is not a subresource, but if it has an .import file, it's imported so treat it as read only.
if (FileAccess::exists(path + ".import")) {
return true;
}
return true;
}
return false;