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

Remove the obsolete "2D Pixel" import preset
This commit is contained in:
Rémi Verschelde 2020-06-15 09:22:06 +02:00 committed by GitHub
commit 8de945d7ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View file

@ -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];

View file

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