Merge pull request #13204 from mrdoob/editor-improvements

Editor: Rescued local/world checkbox.
mrdoob · Jan 30, 2018 · 7c6b671 · 7c6b671
2 parents f09e1a6 + 9eba1d2
commit 7c6b671
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/editor/js/Sidebar.Settings.Viewport.js b/editor/js/Sidebar.Settings.Viewport.js
@@ -20,19 +20,13 @@ Sidebar.Settings.Viewport = function ( editor ) {
 
 	var snap = new UI.THREE.Boolean( false, 'snap' ).onChange( update );
 	container.add( snap );
-
-	var local = new UI.THREE.Boolean( false, 'local' ).onChange( update );
-	container.add( local );
 	*/
 
 	function update() {
 
 		signals.showGridChanged.dispatch( show.getValue() );
 
-		/*
-		signals.snapChanged.dispatch( snap.getValue() === true ? snapSize.getValue() : null );
-		signals.spaceChanged.dispatch( local.getValue() === true ? "local" : "world" );
-		*/
+		// signals.snapChanged.dispatch( snap.getValue() === true ? snapSize.getValue() : null );
 
 	}
 

diff --git a/editor/js/Toolbar.js b/editor/js/Toolbar.js
@@ -42,6 +42,14 @@ var Toolbar = function ( editor ) {
 	} );
 	buttons.add( scale );
 
+	var local = new UI.THREE.Boolean( false, 'local' )
+	local.onChange( function () {
+
+		signals.spaceChanged.dispatch( this.getValue() === true ? 'local' : 'world' );
+
+	} );
+	buttons.add( local );
+
 	signals.transformModeChanged.add( function ( mode ) {
 
 		translate.dom.classList.remove( 'selected' );