Merge pull request #19 from vinova/master

Use ccGLBlendFunc instead of glBlendFunc in CCSkeleton::draw()

.gitignore

@@ -11,4 +11,5 @@ spine-cocos2dx/cocos2dx/
 !spine-cocos2dx/cocos2dx/Place cocos2dx here.txt
 *.swp
 .DS_Store
-xcuserdata
+xcuserdata
+spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/*

spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/pancake.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
-	<true/>
-	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
-	<false/>
-</dict>
-</plist>

spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp

@@ -67,7 +67,7 @@ void CCSkeleton::update (float deltaTime) {
 
 void CCSkeleton::draw () {
 	CC_NODE_DRAW_SETUP();
-	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	ccGLBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	skeleton->draw();
 
 	if (debug) {