Merge remote-tracking branch 'upstream/dev'

README.md

@@ -63,6 +63,7 @@ More? [#three.js on irc.freenode.net](http://webchat.freenode.net/?channels=thre
 
 ### Featured projects ###
 
+<a href="http://lights.elliegoulding.com/"><img src="http://mrdoob.github.com/three.js/assets/projects/20_lights.png" width="109" height="82" alt="Lights"></a>
 <a href="http://inear.se/beanstalk/"><img src="http://mrdoob.github.com/three.js/assets/projects/19_beanstalk.png" width="109" height="82" alt="Infinite beanstalk"></a>
 <a href="http://superfad.com/missioncontrol/"><img src="http://mrdoob.github.com/three.js/assets/projects/18_missioncontrol.png" width="109" height="82" alt="Mission Control"></a>
 <a href="http://ro.me/"><img src="http://mrdoob.github.com/three.js/assets/projects/17_rome.png" width="109" height="82" alt="ROME"></a>

src/extras/geometries/OctahedronGeometry.js

@@ -13,7 +13,7 @@ THREE.OctahedronGeometry = function ( radius, detail ) {
 
 	THREE.Geometry.call( this );
 
-	detail = isFinite(detail) ? detail : 3; // allow a zero value
+	detail = detail || 0;
 
 	var that = this; // ugly scope hack
 

src/extras/loaders/SceneLoader.js

@@ -760,6 +760,9 @@ THREE.SceneLoader.prototype = {
 
 			scope.callbackSync( result );
 
+			// just in case there are no async elements:
+			async_callback_gate();
+
 		};
 
 	},