Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of github.com:super626/cocos2d-x into v3Animation

This commit is contained in:
Huabing.Xu 2014-06-17 16:37:03 +08:00
parent 8efaf11a85 e1fb8c82f0
commit 77091cad8b
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/3d/CCAnimate3D.cpp
View File

@ -22,10 +22,10 @@
THE SOFTWARE.
****************************************************************************/
#include "CCAnimate3D.h"
#include "CCAnimation3D.h"
#include "CCSprite3D.h"
#include "CCMeshSkin.h"
#include "3d/CCAnimate3D.h"
#include "3d/CCAnimation3D.h"
#include "3d/CCSprite3D.h"
#include "3d/CCMeshSkin.h"
#include "base/ccMacros.h"
#include "platform/CCFileUtils.h"

2
cocos/3d/CCBundle3D.cpp
View File

@ -26,7 +26,7 @@
#include "base/ccMacros.h"
#include "platform/CCFileUtils.h"
#include "renderer/CCGLProgram.h"
NS_CC_BEGIN

5
cocos/3d/CCBundle3D.h
View File

@ -27,15 +27,12 @@
#include <map>
#include "3d/CCMesh.h"
#include "3d/CCBundle3DData.h"
#include "base/ccMacros.h"
#include "base/CCRef.h"
#include "base/ccTypes.h"
#include "3d/CCMesh.h"
#include "3d/CCBundle3DData.h"
#include "json/document.h"
NS_CC_BEGIN