From 26161de739803f3f80c76de01fd4032d39d48e47 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 14 Jun 2020 15:08:09 +0200 Subject: [PATCH] Remove the obsolete "2D Pixel" import preset Texture filtering is now defined on a per-node basis, thanks to bindless textures provided by Vulkan. This closes #37057. --- editor/import/resource_importer_texture.cpp | 7 +++---- editor/import/resource_importer_texture.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index a13324f0fcc..3a0e624a8f4 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/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 { - return 4; + return 3; } String ResourceImporterTexture::get_preset_name(int p_idx) const { static const char *preset_names[] = { - "2D, Detect 3D", + "2D/3D (Auto-Detect)", "2D", - "2D Pixel", - "3D" + "3D", }; return preset_names[p_idx]; diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h index b770d240ebf..12eb7f67c29 100644 --- a/editor/import/resource_importer_texture.h +++ b/editor/import/resource_importer_texture.h @@ -93,7 +93,6 @@ public: enum Preset { PRESET_DETECT, PRESET_2D, - PRESET_2D_PIXEL, PRESET_3D, };