Skip to content

Commit 3911e09

Browse files
authored
Merge pull request godotengine#118126 from StarryWorm/fix-CI-clangdtidy
Fix CI errors after recent merge batches
2 parents 33536fb + a88418e commit 3911e09

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

core/object/script_language.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "core/core_bind.h"
3636
#include "core/debugger/engine_debugger.h"
3737
#include "core/debugger/script_debugger.h"
38-
#include "core/io/resource_loader.h"
3938
#include "core/object/callable_mp.h"
4039
#include "core/object/class_db.h"
4140
#include "core/templates/sort_array.h"

doc/classes/RDAccelerationStructureGeometry.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<class name="RDAccelerationStructureGeometry" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
2+
<class name="RDAccelerationStructureGeometry" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
33
<brief_description>
44
Acceleration structure geometry (used by [RenderingDevice]).
55
</brief_description>

tests/test_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "core/input/input.h"
3535
#include "core/input/input_map.h"
3636
#include "core/io/dir_access.h"
37+
#include "core/object/worker_thread_pool.h"
3738
#include "core/os/os.h"
3839
#include "core/string/translation_server.h"
3940
#include "scene/main/scene_tree.h"
@@ -42,7 +43,6 @@
4243
#include "servers/audio/audio_server.h"
4344
#include "servers/display/accessibility_server.h"
4445
#include "servers/rendering/rendering_server.h"
45-
#include "servers/rendering/rendering_server_default.h"
4646
#include "tests/display_server_mock.h"
4747
#include "tests/force_link.gen.h"
4848
#include "tests/signal_watcher.h"

0 commit comments

Comments
 (0)