Selaa lähdekoodia

Revert "Allow skipping imported resource files from export"

This reverts commit 398892ccc01cec724c5f4c9cdfd0fb7e746a0fa7.
Allen Pestaluky 1 vuosi sitten
vanhempi
commit
262e5db785
2 muutettua tiedostoa jossa 1 lisäystä ja 13 poistoa
  1. 1 1
      doc/classes/EditorExportPlugin.xml
  2. 0 12
      editor/export/editor_export_platform.cpp

+ 1 - 1
doc/classes/EditorExportPlugin.xml

@@ -317,7 +317,7 @@
 		<method name="skip">
 			<return type="void" />
 			<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>
 		</method>
 	</methods>

+ 0 - 12
editor/export/editor_export_platform.cpp

@@ -797,10 +797,6 @@ String EditorExportPlatform::_export_customize(const String &p_path, LocalVector
 		if (!customize_scenes_plugins.is_empty()) {
 			for (Ref<EditorExportPlugin> &plugin : customize_scenes_plugins) {
 				Node *customized = plugin->_customize_scene(node, p_path);
-				if (plugin->skipped) {
-					plugin->_clear();
-					return String();
-				}
 				if (customized != nullptr) {
 					node = customized;
 					modified = true;
@@ -834,10 +830,6 @@ String EditorExportPlatform::_export_customize(const String &p_path, LocalVector
 		if (!customize_resources_plugins.is_empty()) {
 			for (Ref<EditorExportPlugin> &plugin : customize_resources_plugins) {
 				Ref<Resource> new_res = plugin->_customize_resource(res, p_path);
-				if (plugin->skipped) {
-					plugin->_clear();
-					return String();
-				}
 				if (new_res.is_valid()) {
 					modified = true;
 					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.
 
 			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) {
 				// It was actually customized.