Actual buildable 4.6.1 release

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) {