From 6c39dc0e18a4fd5e41128dba4496b1a78c3be039 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Tue, 17 Jun 2014 15:28:14 +0800 Subject: [PATCH 1/2] adjust includes --- cocos/3d/CCAnimate3D.cpp | 8 ++++---- cocos/3d/CCBundle3D.h | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cocos/3d/CCAnimate3D.cpp b/cocos/3d/CCAnimate3D.cpp index 7b75eca12d..bff4b90323 100644 --- a/cocos/3d/CCAnimate3D.cpp +++ b/cocos/3d/CCAnimate3D.cpp @@ -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" diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h index dbaefa1cc6..f3e0d8e31c 100644 --- a/cocos/3d/CCBundle3D.h +++ b/cocos/3d/CCBundle3D.h @@ -27,15 +27,12 @@ #include -#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 From e1fb8c82f0b03bbfea62aadd366216ef96bed574 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Tue, 17 Jun 2014 15:31:45 +0800 Subject: [PATCH 2/2] missing include --- cocos/3d/CCBundle3D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp index 66edc74c1f..6d250b2cd2 100644 --- a/cocos/3d/CCBundle3D.cpp +++ b/cocos/3d/CCBundle3D.cpp @@ -26,7 +26,7 @@ #include "base/ccMacros.h" #include "platform/CCFileUtils.h" - +#include "renderer/CCGLProgram.h" NS_CC_BEGIN