Merge pull request #168 from cx20/develop

Removed duplicate variable definitions
emadurandal · Jun 27, 2018 · 3e7b42c · 3e7b42c
2 parents d811786 + 053ff76
commit 3e7b42c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/VERSION-FILE b/VERSION-FILE
@@ -1,6 +1,6 @@
-version: 0.0.4-27-gfea5-mod
-branch: feature/camera-walk-through
-6a6b6b717c323fe65ea0e84c391da664aa719772c526a752f2d4c6e406b35241 ./build/glboost.js
-6a6b6b717c323fe65ea0e84c391da664aa719772c526a752f2d4c6e406b35241 ./build/glboost.js
-ed9b43d3735cd57ed730011951d4797e249473c66ed393d79baa7a8d34eb51c7 ./build/glboost.min.js
-556cb0d28e9cfa72c840423ac819f50d59e46a7146139b2631dd54cb698c5112 ./build/glboost.min.js.map
+version: 0.0.4-26-g5494-mod
+branch: develop
+
+
+
+
diff --git a/build/glboost.js b/build/glboost.js
@@ -19777,7 +19777,6 @@ return mat4(
               glboostMaterial = glBoostContext.createClassicMaterial();
             }
 
-            let options = gltfModel.asset.extras.glboostOptions;
             const defaultShader = this._getDefaultShader(options);
             if (defaultShader) {
               glboostMaterial.shaderClass = defaultShader;
@@ -20985,4 +20984,4 @@ return mat4(
 
 })));
 
-(0,eval)('this').GLBoost.VERSION='version: 0.0.4-27-gfea5-mod branch: feature/camera-walk-through';
+(0,eval)('this').GLBoost.VERSION='version: 0.0.4-26-g5494-mod branch: develop';
diff --git a/build/glboost.min.js b/build/glboost.min.js
diff --git a/build/glboost.min.js.map b/build/glboost.min.js.map
diff --git a/src/middle_level/loader/ModelConverter.js b/src/middle_level/loader/ModelConverter.js
@@ -330,7 +330,6 @@ export default class ModelConverter {
             glboostMaterial = glBoostContext.createClassicMaterial();
           }
 
-          let options = gltfModel.asset.extras.glboostOptions;
           const defaultShader = this._getDefaultShader(options);
           if (defaultShader) {
             glboostMaterial.shaderClass = defaultShader;