Merge pull request #6837 from AnalyticalGraphicsInc/fix-oit-picking

Fix oit/picking bug
CesiumGS · Jul 24, 2018 · f1e58f9 · f1e58f9
2 parents c65b907 + e28bdc6
commit f1e58f9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js
@@ -1524,10 +1524,6 @@ define([
                 derivedCommands.logDepth = undefined;
             }
 
-            if (scene.frameState.passes.pick && !defined(command.pickId)) {
-                return;
-            }
-
             if (shadowsEnabled && (command.receiveShadows || command.castShadows)) {
                 derivedCommands.shadows = ShadowMap.createDerivedCommands(shadowMaps, lightShadowMaps, command, shadowsDirty, context, derivedCommands.shadows);
                 if (useLogDepth) {
@@ -1554,6 +1550,10 @@ define([
                 }
             }
 
+            if (scene.frameState.passes.pick && !defined(command.pickId)) {
+                return;
+            }
+
             derivedCommands.depth = DerivedCommand.createDepthOnlyDerivedCommand(scene, command, context, derivedCommands.depth);
         }
     }