From f097c76e461751948849ddbc0dbcd8cfb8820df4 Mon Sep 17 00:00:00 2001 From: "Huabing.Xu" Date: Fri, 10 Oct 2014 14:05:57 +0800 Subject: [PATCH] fix compile error for macro redefinition --- cocos/renderer/ccShader_3D_PositionNormalTex.vert | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cocos/renderer/ccShader_3D_PositionNormalTex.vert b/cocos/renderer/ccShader_3D_PositionNormalTex.vert index 8a77ef42f9..3bc58b91a1 100644 --- a/cocos/renderer/ccShader_3D_PositionNormalTex.vert +++ b/cocos/renderer/ccShader_3D_PositionNormalTex.vert @@ -1,9 +1,5 @@ const char* cc3D_PositionNormalTex_vert = STRINGIFY( -\n#define MAX_DIRECTIONAL_LIGHT_NUM 1 \n -\n#define MAX_POINT_LIGHT_NUM 1 \n -\n#define MAX_SPOT_LIGHT_NUM 1 \n -\n#define MAX_AMBIENT_LIGHT_NUM 1 \n \n#if (MAX_POINT_LIGHT_NUM > 0)\n uniform vec3 u_PointLightSourcePosition[MAX_POINT_LIGHT_NUM]; @@ -55,10 +51,6 @@ void main(void) ); const char* cc3D_SkinPositionNormalTex_vert = STRINGIFY( -\n#define MAX_DIRECTIONAL_LIGHT_NUM 1 \n -\n#define MAX_POINT_LIGHT_NUM 1 \n -\n#define MAX_SPOT_LIGHT_NUM 1 \n -\n#define MAX_AMBIENT_LIGHT_NUM 1 \n \n#if (MAX_POINT_LIGHT_NUM > 0)\n uniform vec3 u_PointLightSourcePosition[MAX_POINT_LIGHT_NUM];