UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta

Browse Source
This commit is contained in:
Nathan Sweet 2018-05-02 22:24:38 +02:00
commit 398636a20a
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs
View File

@ -968,11 +968,6 @@ namespace Spine.Unity {
var vbi = vertexBuffer.Items;
var ubi = uvBuffer.Items;
var cbi = colorBuffer.Items;
<<<<<<< HEAD
=======
//var sbi = submeshes.Items;
//int submeshCount = submeshes.Count;
>>>>>>> 3.6
// Zero the extra.
{