Merge branch 'dev' of http://github.com/mrdoob/three.js into adsk-dev

editor/css/dark.css

@@ -174,6 +174,10 @@ input.Number {
 					background-color: #08f;
 				}
 
+				#menubar .menu .options .option:active {
+					color: #666;
+					background: transparent;
+				}
 
 #sidebar {
 	position: absolute;

editor/css/light.css

@@ -147,6 +147,10 @@ input.Number {
 					background-color: #08f;
 				}
 
+				#menubar .menu .options .option:active {
+					color: #666;
+					background: transparent;
+				}
 
 #sidebar {
 	position: absolute;

editor/js/Player.js

@@ -15,12 +15,6 @@ var Player = function ( editor ) {
 
 	var load = function ( json ) {
 
-		if ( renderer !== undefined ) {
-
-			container.dom.removeChild( renderer.domElement );
-
-		}
-
 		renderer = new THREE.WebGLRenderer( { antialias: true } );
 		renderer.setSize( container.dom.offsetWidth, container.dom.offsetHeight );
 		container.dom.appendChild( renderer.domElement );
@@ -61,6 +55,12 @@ var Player = function ( editor ) {
 
 		cancelAnimationFrame( request );
 
+		if ( renderer !== undefined ) {
+
+			container.dom.removeChild( renderer.domElement );
+
+		}
+
 	};
 
 	var render = function () {

examples/js/controls/EditorControls.js

@@ -183,6 +183,8 @@ THREE.EditorControls = function ( object, domElement ) {
 
 	function onMouseWheel( event ) {
 
+		event.preventDefault();
+
 		// if ( scope.enabled === false ) return;
 
 		var delta = 0;

src/core/Projector.js

@@ -675,7 +675,11 @@ THREE.Projector = function () {
 
 		}
 
-		if ( sortElements === true ) _renderData.elements.sort( painterSort );
+		if ( sortElements === true ) {
+
+			_renderData.elements.sort( painterSort );
+
+		}
 
 		return _renderData;