Actual buildable 4.6.1 release

core/templates/command_queue_mt.cpp

@@ -30,9 +30,3 @@
 
 #include "command_queue_mt.h"
 
-CommandQueueMT::CommandQueueMT() {
-	command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024);
-}
-
-CommandQueueMT::~CommandQueueMT() {
-}

core/templates/rid_owner.cpp

@@ -30,4 +30,3 @@
 
 #include "rid_owner.h"
 
-SafeNumeric<uint64_t> RID_AllocBase::base_id{ 1 };

drivers/d3d12/SCsub

@@ -171,13 +171,16 @@ env_thirdparty.Prepend(
     CPPPATH=[
         "#thirdparty/directx_headers/include/directx",
         "#thirdparty/directx_headers/include/dxguids",
-        "#thirdparty/d3d12ma",
     ]
 )
 
-env_thirdparty.add_source_files(thirdparty_obj, "#thirdparty/d3d12ma/D3D12MemAlloc.cpp")
 env.drivers_sources += thirdparty_obj
 
+env_d3d12_rdd.Prepend(CPPPATH=[
+    "#thirdparty/d3d12ma",
+    "#thirdparty/directx_headers/include/dxguids",
+])
+
 # Godot source files.
 
 driver_obj = []

editor/docks/node_dock.cpp

@@ -88,8 +88,8 @@ void NodeDock::update_lists() {
 }
 
 void NodeDock::set_node(Node *p_node) {
-	connections->set_node(p_node);
-	groups->set_current(p_node);
+	connections->set_object(p_node);
+	groups->set_selection(p_node ? Vector<Node *>{ p_node } : Vector<Node *>{});
 
 	if (p_node) {
 		if (connections_button->is_pressed()) {

modules/godot_physics_2d/godot_broad_phase_2d.cpp

@@ -30,7 +30,3 @@
 
 #include "godot_broad_phase_2d.h"
 
-GodotBroadPhase2D::CreateFunction GodotBroadPhase2D::create_func = nullptr;
-
-GodotBroadPhase2D::~GodotBroadPhase2D() {
-}

modules/godot_physics_3d/godot_broad_phase_3d.cpp

@@ -30,7 +30,3 @@
 
 #include "godot_broad_phase_3d.h"
 
-GodotBroadPhase3D::CreateFunction GodotBroadPhase3D::create_func = nullptr;
-
-GodotBroadPhase3D::~GodotBroadPhase3D() {
-}

modules/minimp3/SCsub

@@ -8,7 +8,7 @@ env_minimp3 = env_modules.Clone()
 
 thirdparty_dir = "#thirdparty/minimp3/"
 
-env_minimp3.Prepend(CPPEXTPATH=[thirdparty_dir])
+env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
 
 if not env["minimp3_extra_formats"]:
     env_minimp3.Append(CPPDEFINES=["MINIMP3_ONLY_MP3"])

modules/minimp3/audio_stream_mp3.cpp

@@ -34,6 +34,8 @@
 
 #include "audio_stream_mp3.h"
 
+#include "core/io/file_access.h"
+
 int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) {
 	if (!active) {
 		return 0;
@@ -239,7 +241,7 @@ void AudioStreamMP3::set_data(const Vector<uint8_t> &p_data) {
 }
 
 Vector<uint8_t> AudioStreamMP3::get_data() const {
-	return data;
+	return Vector<uint8_t>(data);
 }
 
 void AudioStreamMP3::set_loop(bool p_enable) {

servers/rendering/dummy/storage/texture_storage.cpp

@@ -32,12 +32,3 @@
 
 using namespace RendererDummy;
 
-TextureStorage *TextureStorage::singleton = nullptr;
-
-TextureStorage::TextureStorage() {
-	singleton = this;
-}
-
-TextureStorage::~TextureStorage() {
-	singleton = nullptr;
-}

servers/rendering/renderer_rd/storage_rd/forward_id_storage.cpp

@@ -32,12 +32,3 @@
 
 using namespace RendererRD;
 
-ForwardIDStorage *ForwardIDStorage::singleton = nullptr;
-
-ForwardIDStorage::ForwardIDStorage() {
-	singleton = this;
-}
-
-ForwardIDStorage::~ForwardIDStorage() {
-	singleton = nullptr;
-}

servers/rendering/renderer_rd/storage_rd/render_data_rd.cpp

@@ -30,18 +30,3 @@
 
 #include "render_data_rd.h"
 
-Ref<RenderSceneBuffers> RenderDataRD::get_render_scene_buffers() const {
-	return render_buffers;
-}
-
-RenderSceneData *RenderDataRD::get_render_scene_data() const {
-	return scene_data;
-}
-
-RID RenderDataRD::get_environment() const {
-	return environment;
-}
-
-RID RenderDataRD::get_camera_attributes() const {
-	return camera_attributes;
-}

servers/rendering/rendering_method.cpp

@@ -30,8 +30,3 @@
 
 #include "rendering_method.h"
 
-RenderingMethod::RenderingMethod() {
-}
-
-RenderingMethod::~RenderingMethod() {
-}

servers/rendering/rendering_server_globals.cpp

@@ -30,20 +30,3 @@
 
 #include "rendering_server_globals.h"
 
-bool RenderingServerGlobals::threaded = false;
-
-RendererUtilities *RenderingServerGlobals::utilities = nullptr;
-RendererLightStorage *RenderingServerGlobals::light_storage = nullptr;
-RendererMaterialStorage *RenderingServerGlobals::material_storage = nullptr;
-RendererMeshStorage *RenderingServerGlobals::mesh_storage = nullptr;
-RendererParticlesStorage *RenderingServerGlobals::particles_storage = nullptr;
-RendererTextureStorage *RenderingServerGlobals::texture_storage = nullptr;
-RendererGI *RenderingServerGlobals::gi = nullptr;
-RendererFog *RenderingServerGlobals::fog = nullptr;
-RendererCameraAttributes *RenderingServerGlobals::camera_attributes = nullptr;
-RendererCanvasRender *RenderingServerGlobals::canvas_render = nullptr;
-RendererCompositor *RenderingServerGlobals::rasterizer = nullptr;
-
-RendererCanvasCull *RenderingServerGlobals::canvas = nullptr;
-RendererViewport *RenderingServerGlobals::viewport = nullptr;
-RenderingMethod *RenderingServerGlobals::scene = nullptr;

servers/xr/xr_controller_tracker.cpp

@@ -29,11 +29,3 @@
 /**************************************************************************/
 
 #include "xr_controller_tracker.h"
-
-#include "core/input/input.h"
-
-void XRControllerTracker::_bind_methods() {}
-
-XRControllerTracker::XRControllerTracker() {
-	type = XRServer::TRACKER_CONTROLLER;
-}