Merge branch '4.1' into 4.2-beta

.github/workflows/spine-godot-v4.yml

@@ -183,13 +183,13 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: godot-template-windows-debug.zip
-          path: spine-godot/godot/bin/windows_64_debug.exe
+          path: spine-godot/godot/bin/windows_debug_x86_64.exe.exe
 
       - name: Upload artifacts release
         uses: actions/upload-artifact@v2
         with:
           name: godot-template-windows-release.zip
-          path: spine-godot/godot/bin/windows_64_release.exe
+          path: spine-godot/godot/bin/windows_debug_x86_64.exe.exe
 
   godot-template-android:
     runs-on: ubuntu-20.04

spine-godot/build/build-v4.sh

@@ -28,8 +28,8 @@ echo "CPUS: $cpus"
 
 pushd ../godot
 if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then	
-	scons $target arch=x86_64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
-	scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
+	scons $target arch=x86_64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
+	scons $target arch=arm64 compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus
 
 	pushd bin
 	cp -r ../misc/dist/macos_tools.app .
@@ -47,7 +47,7 @@ else
 	if [ "$dev" = "true" ]; then
 		target="$target dev_build=true"
 	fi
-	scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus	
+	scons $target compiledb=yes custom_modules="../spine_godot" opengl3=yes --jobs=$cpus	
 	cp compile_commands.json ../build
 	if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then
 		strip bin/godot.linuxbsd.editor.x86_64

spine-godot/build/install-macos-vulkan-sdk.sh

@@ -6,5 +6,5 @@ curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/
 hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
 /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
     --accept-licenses --default-answer --confirm-command install
-hdiutil detach /Volumes/vulkan-sdk
+# hdiutil detach /Volumes/vulkan-sdk
 rm -f /tmp/vulkan-sdk.dmg