Merge branch '3.8' into 3.9-beta

spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp

@@ -66,7 +66,7 @@ void SkeletonBounds::update(Skeleton &skeleton, bool updateAabb) {
 		BoundingBoxAttachment *boundingBox = static_cast<BoundingBoxAttachment *>(attachment);
 		_boundingBoxes.add(boundingBox);
 
-		Polygon *polygonP = NULL;
+		spine::Polygon *polygonP = NULL;
 		size_t poolCount = _polygonPool.size();
 		if (poolCount > 0) {
 			polygonP = _polygonPool[poolCount - 1];
@@ -127,7 +127,7 @@ bool SkeletonBounds::aabbIntersectsSkeleton(SkeletonBounds bounds) {
 	return _minX < bounds._maxX && _maxX > bounds._minX && _minY < bounds._maxY && _maxY > bounds._minY;
 }
 
-bool SkeletonBounds::containsPoint(Polygon *polygon, float x, float y) {
+bool SkeletonBounds::containsPoint(spine::Polygon *polygon, float x, float y) {
 	Vector<float> &vertices = polygon->_vertices;
 	int nn = polygon->_count;
 
@@ -159,7 +159,7 @@ BoundingBoxAttachment *SkeletonBounds::intersectsSegment(float x1, float y1, flo
 	return NULL;
 }
 
-bool SkeletonBounds::intersectsSegment(Polygon *polygon, float x1, float y1, float x2, float y2) {
+bool SkeletonBounds::intersectsSegment(spine::Polygon *polygon, float x1, float y1, float x2, float y2) {
 	Vector<float> &vertices = polygon->_vertices;
 	size_t nn = polygon->_count;
 
@@ -205,7 +205,7 @@ void SkeletonBounds::aabbCompute() {
 	float maxY = FLT_MAX;
 
 	for (size_t i = 0, n = _polygons.size(); i < n; ++i) {
-		Polygon *polygon = _polygons[i];
+		spine::Polygon *polygon = _polygons[i];
 		Vector<float> &vertices = polygon->_vertices;
 		for (int ii = 0, nn = polygon->_count; ii < nn; ii += 2) {
 			float x = vertices[ii];