Skip to content

Commit dbddacc

Browse files
Fix static check
1 parent a9ebac7 commit dbddacc

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎editor/settings/editor_settings.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
#include "core/io/resource_loader.h"
4444
#include "core/io/resource_saver.h"
4545
#include "core/object/class_db.h"
46-
#include "core/variant/variant_parser.h"
4746
#include "core/os/keyboard.h"
4847
#include "core/os/os.h"
4948
#include "core/string/translation_server.h"
49+
#include "core/variant/variant_parser.h"
5050
#include "core/version.h"
5151
#include "editor/editor_node.h"
5252
#include "editor/file_system/editor_paths.h"
@@ -1290,7 +1290,6 @@ Color EditorSettings::get_default_base_color() {
12901290
return Color(0.06, 0.09, 0.14);
12911291
}
12921292

1293-
12941293
String EditorSettings::get_newest_settings_path() {
12951294
const String config_file_name = vformat("editor_settings-%d.%d.tres", REDOT_VERSION_MAJOR, REDOT_VERSION_MINOR);
12961295
return EditorPaths::get_singleton()->get_config_dir().path_join(config_file_name);

‎main/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,7 +3166,7 @@ Error Main::setup2(bool p_show_boot_logo) {
31663166
window_position = &position;
31673167
}
31683168

3169-
Color boot_bg_color = _get_boot_splash_bg_color();
3169+
Color boot_bg_color = get_boot_splash_bg_color();
31703170
DisplayServer::set_early_window_clear_color_override(true, boot_bg_color);
31713171

31723172
DisplayServer::Context context;
@@ -3481,7 +3481,7 @@ Error Main::setup2(bool p_show_boot_logo) {
34813481
}
34823482
}
34833483

3484-
Color clear = GLOBAL_DEF_BASIC("rendering/environment/defaults/default_clear_color", _get_boot_splash_bg_color());
3484+
Color clear = GLOBAL_DEF_BASIC("rendering/environment/defaults/default_clear_color", get_boot_splash_bg_color());
34853485
RenderingServer::get_singleton()->set_default_clear_color(clear);
34863486

34873487
if (p_show_boot_logo) {
@@ -3762,7 +3762,7 @@ Error Main::setup2(bool p_show_boot_logo) {
37623762
return OK;
37633763
}
37643764

3765-
Color Main::_get_boot_splash_bg_color() {
3765+
Color Main::get_boot_splash_bg_color() {
37663766
#if defined(TOOLS_ENABLED)
37673767
if (editor || project_manager) {
37683768
if (EditorSettings::get_singleton()) {
@@ -3820,7 +3820,7 @@ void Main::setup_boot_logo() {
38203820
boot_logo->set_pixel(0, 0, Color(0, 0, 0, 0));
38213821
}
38223822

3823-
Color boot_bg_color = _get_boot_splash_bg_color();
3823+
Color boot_bg_color = get_boot_splash_bg_color();
38243824
if (boot_logo.is_valid()) {
38253825
RenderingServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale, boot_logo_filter);
38263826

‎main/main.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Main {
7575
static Error setup2(bool p_show_boot_logo = true); // The thread calling setup2() will effectively become the main thread.
7676
static String get_rendering_driver_name();
7777
static void setup_boot_logo();
78-
static Color _get_boot_splash_bg_color();
78+
static Color get_boot_splash_bg_color();
7979
#ifdef TESTS_ENABLED
8080
static Error test_setup();
8181
static void test_cleanup();

‎servers/rendering/renderer_viewport.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include "core/config/project_settings.h"
3636
#include "core/math/transform_interpolator.h"
3737
#include "core/object/worker_thread_pool.h"
38+
#include "main/main.h"
3839
#include "renderer_canvas_cull.h"
3940
#include "renderer_scene_cull.h"
40-
#include "main/main.h"
4141
#include "rendering_server_globals.h"
4242
#include "storage/texture_storage.h"
4343

@@ -747,7 +747,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
747747
#endif // XR_DISABLED
748748

749749
if (Engine::get_singleton()->is_editor_hint()) {
750-
RSG::texture_storage->set_default_clear_color(Main::_get_boot_splash_bg_color());
750+
RSG::texture_storage->set_default_clear_color(Main::get_boot_splash_bg_color());
751751
}
752752

753753
if (sorted_active_viewports_dirty) {

0 commit comments

Comments
 (0)