diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-06-15 09:22:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 09:22:06 +0200 |
commit | 8de945d7ba9eda8955a1c1f78c15baff1be11b5e (patch) | |
tree | dad8b34e9675f4287de300d82edb33faa42e309d | |
parent | 139c490a1aa14d04d84d9ca8afeaae677b784dda (diff) | |
parent | 26161de739803f3f80c76de01fd4032d39d48e47 (diff) |
Merge pull request #39534 from Calinou/remove-2d-pixel-import-preset
Remove the obsolete "2D Pixel" import preset
-rw-r--r-- | editor/import/resource_importer_texture.cpp | 7 | ||||
-rw-r--r-- | 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 a13324f0fc..3a0e624a8f 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 b770d240eb..12eb7f67c2 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, }; |