|
@@ -69,7 +69,7 @@ bool DynamicFontImportSettingsData::_get(const StringName &p_name, Variant &r_re
|
|
|
void DynamicFontImportSettingsData::_get_property_list(List<PropertyInfo> *p_list) const {
|
|
|
for (const List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
|
|
|
if (owner && owner->import_settings_data.is_valid()) {
|
|
|
- if (owner->import_settings_data->get("multichannel_signed_distance_field") && (E->get().option.name == "size" || E->get().option.name == "outline_size" || E->get().option.name == "oversampling")) {
|
|
|
+ if (owner->import_settings_data->get("multichannel_signed_distance_field") && (E->get().option.name == "size" || E->get().option.name == "outline_size")) {
|
|
|
continue;
|
|
|
}
|
|
|
if (!owner->import_settings_data->get("multichannel_signed_distance_field") && (E->get().option.name == "msdf_pixel_range" || E->get().option.name == "msdf_size")) {
|
|
@@ -507,8 +507,6 @@ void DynamicFontImportSettingsDialog::_main_prop_changed(const String &p_edited_
|
|
|
_variations_validate();
|
|
|
} else if (p_edited_property == "keep_rounding_remainders") {
|
|
|
font_preview->set_keep_rounding_remainders(import_settings_data->get("keep_rounding_remainders"));
|
|
|
- } else if (p_edited_property == "oversampling") {
|
|
|
- font_preview->set_oversampling(import_settings_data->get("oversampling"));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -983,7 +981,6 @@ void DynamicFontImportSettingsDialog::_re_import() {
|
|
|
main_settings["hinting"] = import_settings_data->get("hinting");
|
|
|
main_settings["subpixel_positioning"] = import_settings_data->get("subpixel_positioning");
|
|
|
main_settings["keep_rounding_remainders"] = import_settings_data->get("keep_rounding_remainders");
|
|
|
- main_settings["oversampling"] = import_settings_data->get("oversampling");
|
|
|
main_settings["fallbacks"] = import_settings_data->get("fallbacks");
|
|
|
main_settings["compress"] = import_settings_data->get("compress");
|
|
|
|
|
@@ -1296,7 +1293,6 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
|
|
|
}
|
|
|
font_preview->set_subpixel_positioning((TextServer::SubpixelPositioning)font_subpixel_positioning);
|
|
|
font_preview->set_keep_rounding_remainders(import_settings_data->get("keep_rounding_remainders"));
|
|
|
- font_preview->set_oversampling(import_settings_data->get("oversampling"));
|
|
|
}
|
|
|
font_preview_label->add_theme_font_override(SceneStringName(font), font_preview);
|
|
|
font_preview_label->add_theme_font_size_override(SceneStringName(font_size), 200 * EDSCALE);
|
|
@@ -1330,7 +1326,6 @@ DynamicFontImportSettingsDialog::DynamicFontImportSettingsDialog() {
|
|
|
options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), 1));
|
|
|
options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel,Auto (Except Pixel Fonts)"), 4));
|
|
|
options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), true));
|
|
|
- options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_RANGE, "0,10,0.1"), 0.0));
|
|
|
|
|
|
options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::NIL, "Metadata Overrides", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP), Variant()));
|
|
|
options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::DICTIONARY, "language_support"), Dictionary()));
|