diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 21:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:14:28 +0100 |
| commit | b967c910b88ed0cf134749464dcec7f4311e19f4 (patch) | |
| tree | dcf63119d2b917452f8c2b6ce01787eeee02273a /scene/main | |
| parent | 7d691c1812a42d8aafafc2733d59723aa622f44b (diff) | |
| parent | 49fec646cbf3afdf5e7d55589ab359a5ebcdb897 (diff) | |
Merge pull request #36327 from akien-mga/fix-warnings-reenable-werror
Fix compilation warnings and re-enable werror=yes on Travis
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/scene_tree.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 818ae93d95..2a0825252d 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -2073,8 +2073,6 @@ SceneTree::SceneTree() { root->set_as_audio_listener_2d(true); current_scene = NULL; - int ref_atlas_size = GLOBAL_DEF("rendering/quality/reflections/atlas_size", 2048); - ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/reflections/atlas_size", PropertyInfo(Variant::INT, "rendering/quality/reflections/atlas_size", PROPERTY_HINT_RANGE, "0,8192,or_greater")); //next_power_of_2 will return a 0 as min value int msaa_mode = GLOBAL_DEF("rendering/quality/filters/msaa", 0); ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/filters/msaa", PropertyInfo(Variant::INT, "rendering/quality/filters/msaa", PROPERTY_HINT_ENUM, "Disabled,2x,4x,8x,16x,AndroidVR 2x,AndroidVR 4x")); root->set_msaa(Viewport::MSAA(msaa_mode)); |