UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-25 22:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Resolve leftover merge conflict.

Browse Source
This commit is contained in:
John 2018-05-01 21:58:52 +08:00 committed by GitHub
parent 32f326de0f
commit 517d25f6a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 vbi = vertexBuffer.Items;
var ubi = uvBuffer.Items; var ubi = uvBuffer.Items;
var cbi = colorBuffer.Items; var cbi = colorBuffer.Items;
<<<<<<< HEAD
=======
//var sbi = submeshes.Items;
//int submeshCount = submeshes.Count;
>>>>>>> 3.6
// Zero the extra. // Zero the extra.
{ {