Fix crash when using inherit blending mode and the draw descriptor bu…

…ffer is empty (#172) * Fix crash * Updated libs
defold · May 15, 2024 · 7e8fd9f · 7e8fd9f
1 parent 9070380
commit 7e8fd9f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/defold-spine/commonsrc/vertices.cpp b/defold-spine/commonsrc/vertices.cpp
@@ -303,6 +303,11 @@ void MergeDrawDescs(const dmArray<SpineDrawDesc>& src, dmArray<SpineDrawDesc>& d
     dst.SetCapacity(src.Size());
     dst.SetSize(src.Size());
 
+    if (src.Size() == 0)
+    {
+        return;
+    }
+
     SpineDrawDesc* current_draw_desc = dst.Begin();
     *current_draw_desc = src[0];
 

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
diff --git a/defold-spine/src/comp_spine_model.cpp b/defold-spine/src/comp_spine_model.cpp
@@ -912,20 +912,23 @@ namespace dmSpine
         if (use_inherit_blend)
         {
             uint32_t draw_desc_count = world->m_DrawDescBuffer.Size();
-            dmArray<SpineDrawDesc> scratch_draw_descs;
-            MergeDrawDescs(world->m_DrawDescBuffer, scratch_draw_descs);
+            if (draw_desc_count > 0)
+            {
+                dmArray<SpineDrawDesc> scratch_draw_descs;
+                MergeDrawDescs(world->m_DrawDescBuffer, scratch_draw_descs);
 
-            uint32_t merged_size = scratch_draw_descs.Size();
-            uint32_t ro_count_begin = world->m_RenderObjects.Size();
-            world->m_RenderObjects.SetSize(world->m_RenderObjects.Size() + merged_size);
+                uint32_t merged_size = scratch_draw_descs.Size();
+                uint32_t ro_count_begin = world->m_RenderObjects.Size();
+                world->m_RenderObjects.SetSize(world->m_RenderObjects.Size() + merged_size);
 
-            for (int i = 0; i < merged_size; ++i)
-            {
-                dmRender::RenderObject& ro = world->m_RenderObjects[ro_count_begin + i];
-                FillRenderObject(world, render_context, ro, first->m_RenderConstants, texture, material,
-                    SpineBlendModeToRenderBlendMode((spBlendMode) scratch_draw_descs[i].m_BlendMode),
-                    scratch_draw_descs[i].m_VertexStart,
-                    scratch_draw_descs[i].m_VertexCount);
+                for (int i = 0; i < merged_size; ++i)
+                {
+                    dmRender::RenderObject& ro = world->m_RenderObjects[ro_count_begin + i];
+                    FillRenderObject(world, render_context, ro, first->m_RenderConstants, texture, material,
+                        SpineBlendModeToRenderBlendMode((spBlendMode) scratch_draw_descs[i].m_BlendMode),
+                        scratch_draw_descs[i].m_VertexStart,
+                        scratch_draw_descs[i].m_VertexCount);
+                }
             }
         }
         else