Merge pull request #5601 from ggetz/define-jsep

jsep is undefined fix
CesiumGS · Jul 10, 2017 · 12e1d6d · 12e1d6d
2 parents ed53607 + 75aefd4
commit 12e1d6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,10 @@
 Change Log
 ==========
 
-### 1.36 2017-08-01
+### 1.36 - 2017-08-01
 
 * Fixed a bug where a Model's compressed textures were not being displayed. [#5596](https://github.com/AnalyticalGraphicsInc/cesium/pull/5596)
+* Fixed a bug where jsep was undefined when using webpack [#5593](https://github.com/AnalyticalGraphicsInc/cesium/issues/5593)
 
 ### 1.35 - 2017-07-05
 

diff --git a/Source/ThirdParty/jsep.js b/Source/ThirdParty/jsep.js
@@ -680,5 +680,8 @@ define(function() {
 	}
 }(this));
 
-    return jsep.noConflict();
+    // `jsep` only exists when running in the browser
+    if (typeof jsep !== 'undefined') {
+        return jsep.noConflict();
+    }
 });