Skip to content

Commit 0041055

Browse files
authored
Merge pull request #252 from defold/issue-251-crash
Fix crash when using blending or masks
2 parents f2864a5 + 79dd0cd commit 0041055

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

defold-spine/src/comp_spine_model.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,12 @@ namespace dmSpine
997997

998998
uint32_t merged_size = scratch_draw_descs.Size();
999999
uint32_t ro_count_begin = world->m_RenderObjects.Size();
1000-
world->m_RenderObjects.SetSize(world->m_RenderObjects.Size() + merged_size);
1000+
uint32_t expected_size = world->m_RenderObjects.Size() + merged_size;
1001+
if (world->m_RenderObjects.Capacity() < expected_size)
1002+
{
1003+
world->m_RenderObjects.OffsetCapacity(expected_size - world->m_RenderObjects.Capacity());
1004+
}
1005+
world->m_RenderObjects.SetSize(expected_size);
10011006

10021007
for (int i = 0; i < merged_size; ++i)
10031008
{

0 commit comments

Comments
 (0)