Merge pull request #175 from lvlonggame/v3

super626 · super626 · commit b106b2f7ce0f · 2014-12-12T09:52:01.000+07:00
fix bug: same model in mirror state cullFace problem.
diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp
@@ -164,13 +164,13 @@ void MeshCommand::applyRenderState()
     if (_cullFaceEnabled && !s_cullFaceEnabled)
     {
         glEnable(GL_CULL_FACE);
-        if (s_cullFace != _cullFace)
-        {
-            glCullFace(_cullFace);
-            s_cullFace = _cullFace;
-        }
         s_cullFaceEnabled = true;
     }
+    if (s_cullFace != _cullFace)
+    {
+        glCullFace(_cullFace);
+        s_cullFace = _cullFace;
+    }
     if (_depthTestEnabled && !s_depthTestEnabled)
     {
         glEnable(GL_DEPTH_TEST);

Original file line number	Diff line number	Diff line change
`@@ -164,13 +164,13 @@ void MeshCommand::applyRenderState()`
`164`	`164`	`if (_cullFaceEnabled && !s_cullFaceEnabled)`
`165`	`165`	`{`
`166`	`166`	`glEnable(GL_CULL_FACE);`
`167`		`- if (s_cullFace != _cullFace)`
`168`		`- {`
`169`		`- glCullFace(_cullFace);`
`170`		`- s_cullFace = _cullFace;`
`171`		`- }`
`172`	`167`	`s_cullFaceEnabled = true;`
`173`	`168`	`}`
	`169`	`+ if (s_cullFace != _cullFace)`
	`170`	`+ {`
	`171`	`+ glCullFace(_cullFace);`
	`172`	`+ s_cullFace = _cullFace;`
	`173`	`+ }`
`174`	`174`	`if (_depthTestEnabled && !s_depthTestEnabled)`
`175`	`175`	`{`
`176`	`176`	`glEnable(GL_DEPTH_TEST);`