diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-05-08 22:09:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-08 22:09:20 +0200 |
commit | 46f1d4ff8e111b66c457ebcf27c72f84f96721d3 (patch) | |
tree | 097cf00aff54a4a193a611ea11929f60fab8ad10 /scene | |
parent | b9f2e57d6240346f1833fd0390de195c956299e7 (diff) | |
parent | 3a11baaeaca1c6277a77d7b2190d04c40c8d3081 (diff) |
Merge pull request #38563 from Calinou/anisotropic-filtering-enum
Turn the anisotropic filtering setting into an enum
Diffstat (limited to 'scene')
-rw-r--r-- | scene/main/scene_tree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 07cb8e3cd2..7afc1b2edd 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -1422,11 +1422,11 @@ SceneTree::SceneTree() { current_scene = nullptr; int msaa_mode = GLOBAL_DEF("rendering/quality/screen_filters/msaa", 0); - ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/screen_filters/msaa", PropertyInfo(Variant::INT, "rendering/quality/screen_filters/msaa", PROPERTY_HINT_ENUM, "Disabled,2x,4x,8x,16x")); + ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/screen_filters/msaa", PropertyInfo(Variant::INT, "rendering/quality/screen_filters/msaa", PROPERTY_HINT_ENUM, "Disabled (Fastest),2x (Fast),4x (Average),8x (Slow),16x (Slower)")); root->set_msaa(Viewport::MSAA(msaa_mode)); int ssaa_mode = GLOBAL_DEF("rendering/quality/screen_filters/screen_space_aa", 0); - ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/screen_filters/screen_space_aa", PropertyInfo(Variant::INT, "rendering/quality/screen_filters/screen_space_aa", PROPERTY_HINT_ENUM, "Disabled,FXAA")); + ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/screen_filters/screen_space_aa", PropertyInfo(Variant::INT, "rendering/quality/screen_filters/screen_space_aa", PROPERTY_HINT_ENUM, "Disabled (Fastest),FXAA (Fast)")); root->set_screen_space_aa(Viewport::ScreenSpaceAA(ssaa_mode)); { //load default fallback environment |