[Bf-blender-cvs] [3c54db4a4e3] master: Audaspace: port compilation fix from upstream.

Joerg Mueller noreply at git.blender.org
Tue Sep 1 18:13:13 CEST 2020


Commit: 3c54db4a4e393c26bd92769b16bf6b3fb464ffb0
Author: Joerg Mueller
Date:   Tue Sep 1 18:12:48 2020 +0200
Branches: master
https://developer.blender.org/rB3c54db4a4e393c26bd92769b16bf6b3fb464ffb0

Audaspace: port compilation fix from upstream.

===================================================================

M	extern/audaspace/bindings/python/PySound.cpp
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/tools

===================================================================

diff --git a/extern/audaspace/bindings/python/PySound.cpp b/extern/audaspace/bindings/python/PySound.cpp
index f2debccfd33..33628307249 100644
--- a/extern/audaspace/bindings/python/PySound.cpp
+++ b/extern/audaspace/bindings/python/PySound.cpp
@@ -2016,7 +2016,7 @@ AUD_API Sound* checkSound(PyObject* sound)
 
 bool initializeSound()
 {
-	import_array();
+	import_array1(false);
 
 	return PyType_Ready(&SoundType) >= 0;
 }
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 260b439d0fb..2b3c19f5f61 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
+Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f
diff --git a/release/scripts/addons b/release/scripts/addons
index 01cf2f810ad..49c39f59fbc 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a06
+Subproject commit 49c39f59fbc464dd34388990123f271c39eacbf4
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f2f4a8b3bfa..a52733b58d9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a
+Subproject commit a52733b58d95ce60ecde95a9eca242e7319c285a
diff --git a/source/tools b/source/tools
index 2afbb8ec472..896c5f78952 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit 896c5f78952adb2d091d28c65086d46992dabdac



More information about the Bf-blender-cvs mailing list