Swap depth fail draw order.

CesiumGS · Apr 11, 2017 · 8a29014 · 8a29014
1 parent 49edb91
commit 8a29014
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/Source/Scene/Primitive.js b/Source/Scene/Primitive.js
@@ -1545,39 +1545,7 @@ define([
         for (var i = 0; i < length; ++i) {
             var colorCommand;
 
-            if (twoPasses) {
-                colorCommand = colorCommands[i];
-                if (!defined(colorCommand)) {
-                    colorCommand = colorCommands[i] = new DrawCommand({
-                        owner : primitive,
-                        primitiveType : primitive._primitiveType
-                    });
-                }
-                colorCommand.vertexArray = primitive._va[vaIndex];
-                colorCommand.renderState = primitive._backFaceRS;
-                colorCommand.shaderProgram = primitive._sp;
-                colorCommand.uniformMap = uniforms;
-                colorCommand.pass = pass;
-
-                ++i;
-            }
-
-            colorCommand = colorCommands[i];
-            if (!defined(colorCommand)) {
-                colorCommand = colorCommands[i] = new DrawCommand({
-                    owner : primitive,
-                    primitiveType : primitive._primitiveType
-                });
-            }
-            colorCommand.vertexArray = primitive._va[vaIndex];
-            colorCommand.renderState = primitive._frontFaceRS;
-            colorCommand.shaderProgram = primitive._sp;
-            colorCommand.uniformMap = uniforms;
-            colorCommand.pass = pass;
-
             if (defined(primitive._depthFailAppearance)) {
-                ++i;
-
                 if (twoPasses) {
                     colorCommand = colorCommands[i];
                     if (!defined(colorCommand)) {
@@ -1607,7 +1575,39 @@ define([
                 colorCommand.shaderProgram = primitive._spDepthFail;
                 colorCommand.uniformMap = depthFailUniforms;
                 colorCommand.pass = pass;
+
+                ++i;
+            }
+
+            if (twoPasses) {
+                colorCommand = colorCommands[i];
+                if (!defined(colorCommand)) {
+                    colorCommand = colorCommands[i] = new DrawCommand({
+                        owner : primitive,
+                        primitiveType : primitive._primitiveType
+                    });
+                }
+                colorCommand.vertexArray = primitive._va[vaIndex];
+                colorCommand.renderState = primitive._backFaceRS;
+                colorCommand.shaderProgram = primitive._sp;
+                colorCommand.uniformMap = uniforms;
+                colorCommand.pass = pass;
+
+                ++i;
+            }
+
+            colorCommand = colorCommands[i];
+            if (!defined(colorCommand)) {
+                colorCommand = colorCommands[i] = new DrawCommand({
+                    owner : primitive,
+                    primitiveType : primitive._primitiveType
+                });
             }
+            colorCommand.vertexArray = primitive._va[vaIndex];
+            colorCommand.renderState = primitive._frontFaceRS;
+            colorCommand.shaderProgram = primitive._sp;
+            colorCommand.uniformMap = uniforms;
+            colorCommand.pass = pass;
 
             var pickCommand = pickCommands[m];
             if (!defined(pickCommand)) {