diff --git a/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp index a8a227873..b0cc2b431 100644 --- a/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!verticesCount) return; GL::bindTexture2D(texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); diff --git a/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp index a8a227873..b0cc2b431 100644 --- a/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!verticesCount) return; GL::bindTexture2D(texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); diff --git a/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp index a24b5825c..26e35a77d 100644 --- a/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!_verticesCount) return; GL::bindTexture2D(_texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index 28b33db70..af9465264 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -245,6 +245,12 @@ public class SkeletonJson { mesh.setRegionUVs(map.require("uvs").asFloatArray()); mesh.updateUVs(); + //Check if color exists + JsonValue meshColor = map.get("color"); + if(meshColor != null) { + mesh.getColor().set(Color.valueOf(meshColor.asString())); + } + if (map.has("hull")) mesh.setHullLength(map.require("hull").asInt() * 2); if (map.has("edges")) mesh.setEdges(map.require("edges").asIntArray()); mesh.setWidth(map.getFloat("width", 0) * scale);