Merge pull request #181 from defold/issue-9194_

Fix crash with masks
defold · Sep 10, 2024 · a9d0b3b · a9d0b3b
2 parents 9d4f887 + db43f18
commit a9d0b3b
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 0 deletions.
diff --git a/defold-spine/commonsrc/vertices.cpp b/defold-spine/commonsrc/vertices.cpp
@@ -221,6 +221,7 @@ uint32_t CalcVertexBufferSize(const spSkeleton* skeleton, spSkeletonClipping* sk
         {
             CalcAndAddVertexBufferAttachment(attachment, &vertex_count, &max_triangle_count);
         }
+        spSkeletonClipping_clipEnd(skeleton_clipper, slot);
     }
     if (out_max_triangle_count)
     {

diff --git a/defold-spine/lib/arm64-android/libspinec.a b/defold-spine/lib/arm64-android/libspinec.a
diff --git a/defold-spine/lib/arm64-ios/libspinec.a b/defold-spine/lib/arm64-ios/libspinec.a
diff --git a/defold-spine/lib/arm64-osx/libspinec.a b/defold-spine/lib/arm64-osx/libspinec.a
diff --git a/defold-spine/lib/armv7-android/libspinec.a b/defold-spine/lib/armv7-android/libspinec.a
diff --git a/defold-spine/lib/js-web/libspinec.a b/defold-spine/lib/js-web/libspinec.a
diff --git a/defold-spine/lib/wasm-web/libspinec.a b/defold-spine/lib/wasm-web/libspinec.a
diff --git a/defold-spine/lib/x86-win32/spinec.lib b/defold-spine/lib/x86-win32/spinec.lib
diff --git a/defold-spine/lib/x86_64-ios/libspinec.a b/defold-spine/lib/x86_64-ios/libspinec.a
diff --git a/defold-spine/lib/x86_64-linux/libspinec.a b/defold-spine/lib/x86_64-linux/libspinec.a
diff --git a/defold-spine/lib/x86_64-osx/libspinec.a b/defold-spine/lib/x86_64-osx/libspinec.a
diff --git a/defold-spine/lib/x86_64-win32/spinec.lib b/defold-spine/lib/x86_64-win32/spinec.lib
diff --git a/defold-spine/plugins/lib/arm64-osx/libSpineExt.dylib b/defold-spine/plugins/lib/arm64-osx/libSpineExt.dylib
diff --git a/defold-spine/plugins/lib/x86_64-linux/libSpineExt.so b/defold-spine/plugins/lib/x86_64-linux/libSpineExt.so
diff --git a/defold-spine/plugins/lib/x86_64-osx/libSpineExt.dylib b/defold-spine/plugins/lib/x86_64-osx/libSpineExt.dylib
diff --git a/defold-spine/plugins/lib/x86_64-win32/libSpineExt.dll b/defold-spine/plugins/lib/x86_64-win32/libSpineExt.dll
diff --git a/defold-spine/plugins/share/pluginSpineExt.jar b/defold-spine/plugins/share/pluginSpineExt.jar
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 CalcAndAddVertexBufferAttachment(attachment, &vertex_count, &max_triangle_count);
             }
+            spSkeletonClipping_clipEnd(skeleton_clipper, slot);
         }
         if (out_max_triangle_count)
         {
@@ Expand Down @@