godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Allow skipping imported resource files from export" 

This reverts commit 398892ccc0.
This commit is contained in:
Allen Pestaluky 2024-07-02 12:14:10 -04:00
parent 6a13fdcae3
commit 262e5db785
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/EditorExportPlugin.xml
View File

@ -317,7 +317,7 @@
<method name="skip"> <method name="skip">
<return type="void" /> <return type="void" />
<description> <description>
To be called inside [method _export_file], [method _customize_resource], or [method _customize_scene]. Skips the current file, so it's not included in the export. To be called inside [method _export_file]. Skips the current file, so it's not included in the export.
</description> </description>
</method> </method>
</methods> </methods>

12
editor/export/editor_export_platform.cpp
View File

@ -797,10 +797,6 @@ String EditorExportPlatform::_export_customize(const String &p_path, LocalVector
if (!customize_scenes_plugins.is_empty()) { if (!customize_scenes_plugins.is_empty()) {
for (Ref<EditorExportPlugin> &plugin : customize_scenes_plugins) { for (Ref<EditorExportPlugin> &plugin : customize_scenes_plugins) {
Node *customized = plugin->_customize_scene(node, p_path); Node *customized = plugin->_customize_scene(node, p_path);
if (plugin->skipped) {
plugin->_clear();
return String();
}
if (customized != nullptr) { if (customized != nullptr) {
node = customized; node = customized;
modified = true; modified = true;
@ -834,10 +830,6 @@ String EditorExportPlatform::_export_customize(const String &p_path, LocalVector
if (!customize_resources_plugins.is_empty()) { if (!customize_resources_plugins.is_empty()) {
for (Ref<EditorExportPlugin> &plugin : customize_resources_plugins) { for (Ref<EditorExportPlugin> &plugin : customize_resources_plugins) {
Ref<Resource> new_res = plugin->_customize_resource(res, p_path); Ref<Resource> new_res = plugin->_customize_resource(res, p_path);
if (plugin->skipped) {
plugin->_clear();
return String();
}
if (new_res.is_valid()) { if (new_res.is_valid()) {
modified = true; modified = true;
if (new_res != res) { if (new_res != res) {
@ -1143,10 +1135,6 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
// Before doing this, try to see if it can be customized. // Before doing this, try to see if it can be customized.
String export_path = _export_customize(path, customize_resources_plugins, customize_scenes_plugins, export_cache, export_base_path, false); String export_path = _export_customize(path, customize_resources_plugins, customize_scenes_plugins, export_cache, export_base_path, false);
if (export_path.is_empty()) {
// Skipped from plugin.
continue;
}
if (export_path != path) { if (export_path != path) {
// It was actually customized. // It was actually customized.