瀏覽代碼

Merge pull request #39534 from Calinou/remove-2d-pixel-import-preset

Remove the obsolete "2D Pixel" import preset
Rémi Verschelde 5 年之前
父節點
當前提交
8de945d7ba
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 3 4
      editor/import/resource_importer_texture.cpp
  2. 0 1
      editor/import/resource_importer_texture.h

+ 3 - 4
editor/import/resource_importer_texture.cpp

@@ -181,15 +181,14 @@ bool ResourceImporterTexture::get_option_visibility(const String &p_option, cons
 }
 }
 
 
 int ResourceImporterTexture::get_preset_count() const {
 int ResourceImporterTexture::get_preset_count() const {
-	return 4;
+	return 3;
 }
 }
 
 
 String ResourceImporterTexture::get_preset_name(int p_idx) const {
 String ResourceImporterTexture::get_preset_name(int p_idx) const {
 	static const char *preset_names[] = {
 	static const char *preset_names[] = {
-		"2D, Detect 3D",
+		"2D/3D (Auto-Detect)",
 		"2D",
 		"2D",
-		"2D Pixel",
-		"3D"
+		"3D",
 	};
 	};
 
 
 	return preset_names[p_idx];
 	return preset_names[p_idx];

+ 0 - 1
editor/import/resource_importer_texture.h

@@ -93,7 +93,6 @@ public:
 	enum Preset {
 	enum Preset {
 		PRESET_DETECT,
 		PRESET_DETECT,
 		PRESET_2D,
 		PRESET_2D,
-		PRESET_2D_PIXEL,
 		PRESET_3D,
 		PRESET_3D,
 	};
 	};