Changes after review.

CesiumGS · May 9, 2017 · d4ba10c · d4ba10c
1 parent e137165
commit d4ba10c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Pipeline.js b/lib/Pipeline.js
@@ -113,8 +113,10 @@ Pipeline.processJSONWithExtras  = function(gltfWithExtras, options) {
     if (smoothNormals || faceNormals) {
         generateNormals(gltfWithExtras, options);
     }
+
+    var mergeVertices = defaultValue(options.mergeVertices, false);
     if (!shouldPreserve) {
-        if (options.mergeVertices) {
+        if (mergeVertices) {
             mergeDuplicateVertices(gltfWithExtras);
         }
         MergeDuplicateProperties.mergeAll(gltfWithExtras);

diff --git a/specs/lib/PipelineSpec.js b/specs/lib/PipelineSpec.js
@@ -178,7 +178,7 @@ describe('Pipeline', function() {
         spyOn(mergeDuplicateVertices, '_implementation').and.callThrough();
         var promise = readGltf(gltfPath)
             .then(function (gltf) {
-                return processJSONWithExtras(gltf, {mergeVertices: true}).thenReturn(gltf);
+                return processJSONWithExtras(gltf, {mergeVertices: true});
             })
             .then(function (gltf) {
                 expect(mergeDuplicateVertices._implementation).toHaveBeenCalledWith(gltf);