Merge branch '4.1' into 4.2-beta

.github/workflows/format-check.yml

@@ -1,7 +1,8 @@
 name: Check format
 
 on:
-  push:    
+  push:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -51,7 +52,8 @@ jobs:
     - name: Format   
       run: | 
         export CLANGFORMAT=`pwd`/clang/bin/clang-format
-        export PATH="$PATH:/root/.dotnet/tools"      
+        export PATH="$PATH:/root/.dotnet/tools"
+        dotnet-format --version   
         ./formatters/format.sh
         find . -type f -name '*.cs' -exec perl -pi -e 's/\r\n/\n/g' '{}' +
         git diff

.github/workflows/spine-godot.yml

@@ -41,7 +41,7 @@ jobs:
           path: spine-godot/godot/bin/godot.windows.opt.tools.64.exe
 
   godot-editor-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:

spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs

@@ -183,7 +183,7 @@ namespace Spine.Unity {
 				texture = AccessPackedTextureEditor(spriteAtlas);
 			else
 #endif
-				texture = AccessPackedTexture(sprites);
+			texture = AccessPackedTexture(sprites);
 
 			Material material = materials[0];
 #if !UNITY_EDITOR

spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs

@@ -204,7 +204,7 @@ namespace Spine.Unity {
 						DestroyImmediate(collider);
 					else
 #endif
-						Destroy(collider);
+					Destroy(collider);
 				}
 			}
 		}

spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs

@@ -208,7 +208,7 @@ namespace Spine.Unity {
 						DestroyImmediate(collider);
 					else
 #endif
-						Destroy(collider);
+					Destroy(collider);
 				}
 			}
 		}