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

Fixed merge error

This commit is contained in:
KompjoeFriek 2015-02-10 21:37:18 +01:00
parent 00edc542cb
commit 7f28230311
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/renderer/CCMeshCommand.cpp
View File

@ -192,7 +192,7 @@ MeshCommand::~MeshCommand()
void MeshCommand::applyRenderState()
{
_renderStateCullFace = glIsEnabled(GL_CULL_FACE) != GL_FALSE;
_renderStateCullFaceEnabled = glIsEnabled(GL_CULL_FACE) != GL_FALSE;
_renderStateDepthTest = glIsEnabled(GL_DEPTH_TEST) != GL_FALSE;
glGetBooleanv(GL_DEPTH_WRITEMASK, &_renderStateDepthWrite);
GLint cullface;