diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp index 017801c980..5f938e448c 100644 --- a/cocos/renderer/CCMeshCommand.cpp +++ b/cocos/renderer/CCMeshCommand.cpp @@ -530,11 +530,6 @@ void MeshCommand::setLightUniformNames() } } -void MeshCommand::setLightMask( unsigned short lightmask ) -{ - _lightMask = lightmask; -} - #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8) void MeshCommand::listenRendererRecreated(EventCustom* event) { diff --git a/cocos/renderer/CCMeshCommand.h b/cocos/renderer/CCMeshCommand.h index fc2ce40b98..800c89894e 100644 --- a/cocos/renderer/CCMeshCommand.h +++ b/cocos/renderer/CCMeshCommand.h @@ -62,7 +62,7 @@ public: void setMatrixPaletteSize(int size) { _matrixPaletteSize = size; } - void setLightMask(unsigned short lightmask); + void setLightMask(unsigned int lightmask) { _lightMask = lightmask; } void execute(); @@ -127,7 +127,7 @@ protected: // ModelView transform Mat4 _mv; - unsigned short _lightMask; + unsigned int _lightMask; #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8) EventListenerCustom* _rendererRecreatedListener;