diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-08 02:10:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 02:10:35 +0100 |
| commit | 2f0d3d5424c393c756f4cd5cac26287c95aaf4fe (patch) | |
| tree | ad7a7fa1d33b3e46c7f79c9b4016f51d53c67a76 /editor | |
| parent | b61fda9d2a6166e41538405ad8ae24f1aed40570 (diff) | |
| parent | d9f066d5fadfce5fc19310f8ba5ce51d3552bf9e (diff) | |
Merge pull request #61549 from KoBeWi/project_settings_mess
Remove duplicate project settings definitions
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index bd6bc3ece5..1bca1b3c87 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -536,7 +536,7 @@ void EditorNode::_update_from_settings() { RS::get_singleton()->environment_set_volumetric_fog_filter_active(bool(GLOBAL_GET("rendering/environment/volumetric_fog/use_filter"))); RS::get_singleton()->canvas_set_shadow_texture_size(GLOBAL_GET("rendering/2d/shadow_atlas/size")); - bool use_half_res_gi = GLOBAL_DEF("rendering/global_illumination/gi/use_half_resolution", false); + bool use_half_res_gi = GLOBAL_GET("rendering/global_illumination/gi/use_half_resolution"); RS::get_singleton()->gi_set_use_half_resolution(use_half_res_gi); bool snap_2d_transforms = GLOBAL_GET("rendering/2d/snap/snap_2d_transforms_to_pixel"); @@ -5134,7 +5134,7 @@ bool EditorNode::has_scenes_in_session() { bool EditorNode::ensure_main_scene(bool p_from_native) { pick_main_scene->set_meta("from_native", p_from_native); // Whether from play button or native run. - String main_scene = GLOBAL_DEF_BASIC("application/run/main_scene", ""); + String main_scene = GLOBAL_GET("application/run/main_scene"); if (main_scene.is_empty()) { current_menu_option = -1; @@ -5201,7 +5201,7 @@ bool EditorNode::is_run_playing() const { String EditorNode::get_run_playing_scene() const { String run_filename = editor_run.get_running_scene(); if (run_filename.is_empty() && is_run_playing()) { - run_filename = GLOBAL_DEF_BASIC("application/run/main_scene", ""); // Must be the main scene then. + run_filename = GLOBAL_GET("application/run/main_scene"); // Must be the main scene then. } return run_filename; |