Merge remote-tracking branch 'upstream/dev' into water

examples/js/QuickHull.js

@@ -470,7 +470,7 @@
 
 				// 3. The next vertex 'v3' is the one farthest to the plane 'v0', 'v1', 'v2'
 
-				maxDistance = 0;
+				maxDistance = -1;
 				plane.setFromCoplanarPoints( v0.point, v1.point, v2.point );
 
 				for ( i = 0, l = this.vertices.length; i < l; i ++ ) {

examples/js/loaders/AssimpLoader.js

@@ -14,8 +14,8 @@ THREE.AssimpLoader.prototype = {
 
 	crossOrigin: 'Anonymous',
 
-	load: function ( url, onLoad, onProgress, onError ) {
-
+	load: function ( url, onLoad, onProgress, onError ) {
+
 		var scope = this;
 
 		var path = THREE.Loader.prototype.extractUrlBase( url );
@@ -1021,17 +1021,6 @@ THREE.AssimpLoader.prototype = {
 
 		};
 
-		var nameTexMapping = {
-
-			"$tex.ambient": "ambientMap",
-			"$clr.diffuse": "map",
-			"$clr.specular": "specMap",
-			"$clr.emissive": "emissive",
-			"$clr.transparent": "alphaMap",
-			"$clr.reflective": "reflectMap",
-
-		};
-
 		var nameTypeMapping = {
 
 			"?mat.name": "string",

examples/js/objects/Refractor.js

@@ -13,7 +13,7 @@ THREE.Refractor = function ( width, height, options ) {
 
 	options = options || {};
 
-	var color = ( options.color !== undefined ) !== undefined ? new THREE.Color( options.color ) : new THREE.Color( 0x7F7F7F );
+	var color = ( options.color !== undefined ) ? new THREE.Color( options.color ) : new THREE.Color( 0x7F7F7F );
 	var textureWidth = options.textureWidth || 512;
 	var textureHeight = options.textureHeight || 512;
 	var clipBias = options.clipBias || 0;

package.json

@@ -56,6 +56,6 @@
     "rollup": "^0.43.0",
     "rollup-watch": "^4.0.0",
     "uglify-js": "^3.0.23",
-    "electron": "^1.6.1"
+    "electron": "^1.6.14"
   }
 }