Merge pull request #118126 from StarryWorm/fix-CI-clangdtidy
Fix CI errors after recent merge batches
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
#include "core/core_bind.h"
|
||||
#include "core/debugger/engine_debugger.h"
|
||||
#include "core/debugger/script_debugger.h"
|
||||
#include "core/io/resource_loader.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/templates/sort_array.h"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<class name="RDAccelerationStructureGeometry" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
|
||||
<class name="RDAccelerationStructureGeometry" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
|
||||
<brief_description>
|
||||
Acceleration structure geometry (used by [RenderingDevice]).
|
||||
</brief_description>
|
||||
|
||||
+1
-1
@@ -34,6 +34,7 @@
|
||||
#include "core/input/input.h"
|
||||
#include "core/input/input_map.h"
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/object/worker_thread_pool.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/string/translation_server.h"
|
||||
#include "scene/main/scene_tree.h"
|
||||
@@ -42,7 +43,6 @@
|
||||
#include "servers/audio/audio_server.h"
|
||||
#include "servers/display/accessibility_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
#include "servers/rendering/rendering_server_default.h"
|
||||
#include "tests/display_server_mock.h"
|
||||
#include "tests/force_link.gen.h"
|
||||
#include "tests/signal_watcher.h"
|
||||
|
||||
Reference in New Issue
Block a user