Merge pull request #5854 from AnalyticalGraphicsInc/update-gltf-pipel…

…ine-files Update GltfPipeline ForEach and addDefaults
CesiumGS · Sep 28, 2017 · b59f527 · b59f527
2 parents 1228a5e + 63f2052
commit b59f527
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/Source/ThirdParty/GltfPipeline/ForEach.js b/Source/ThirdParty/GltfPipeline/ForEach.js
@@ -6,9 +6,8 @@ define([
 
     /**
      * Contains traversal functions for processing elements of the glTF hierarchy.
-     * @constructor
      */
-    function ForEach() {}
+    var ForEach = {};
 
     ForEach.object = function(arrayOfObjects, handler) {
         if (defined(arrayOfObjects)) {
@@ -211,5 +210,6 @@ define([
     ForEach.texture = function(gltf, handler) {
         ForEach.topLevel(gltf, 'textures', handler);
     };
+
     return ForEach;
 });
diff --git a/Source/ThirdParty/GltfPipeline/addDefaults.js b/Source/ThirdParty/GltfPipeline/addDefaults.js
@@ -384,14 +384,8 @@ define([
     }
 
     function selectDefaultScene(gltf) {
-        var scenes = gltf.scenes;
-
-        if (!defined(gltf.scene)) {
-            var scenesLength = scenes.length;
-            for (var sceneId = 0; sceneId < scenesLength; sceneId++) {
-                gltf.scene = sceneId;
-                break;
-            }
+        if (defined(gltf.scenes) && !defined(gltf.scene)) {
+            gltf.scene = 0;
         }
     }