Browse Source

Editor: Renamed objectRemoved signal to removeSelectedObject.

Mr.doob 12 years ago
parent
commit
c51119784c
2 changed files with 9 additions and 4 deletions
  1. 7 2
      editor/index.html
  2. 2 2
      editor/js/ui/Viewport.js

+ 7 - 2
editor/index.html

@@ -59,10 +59,15 @@
 
 
 			var signals = {
 			var signals = {
 
 
+				// actions
+
+				removeSelectedObject: new SIGNALS.Signal(),
+
+				// notifications
+
 				sceneCreated: new SIGNALS.Signal(),
 				sceneCreated: new SIGNALS.Signal(),
 				sceneChanged: new SIGNALS.Signal(),
 				sceneChanged: new SIGNALS.Signal(),
 				objectAdded: new SIGNALS.Signal(),
 				objectAdded: new SIGNALS.Signal(),
-				objectRemoved: new SIGNALS.Signal(),
 				objectSelected: new SIGNALS.Signal(),
 				objectSelected: new SIGNALS.Signal(),
 				objectChanged: new SIGNALS.Signal(),
 				objectChanged: new SIGNALS.Signal(),
 				materialChanged: new SIGNALS.Signal(),
 				materialChanged: new SIGNALS.Signal(),
@@ -100,7 +105,7 @@
 
 
 					case 46: // delete
 					case 46: // delete
 
 
-						signals.objectRemoved.dispatch();
+						signals.removeSelectedObject.dispatch();
 
 
 						break;
 						break;
 
 

+ 2 - 2
editor/js/ui/Viewport.js

@@ -278,9 +278,9 @@ var Viewport = function ( signals ) {
 
 
 	} );
 	} );
 
 
-	signals.objectRemoved.add( function ( ) {
+	signals.removeSelectedObject.add( function () {
 
 
-		if ( !selected ) {
+		if ( selected === null ) {
 
 
 			console.warn( "No object selected for delete" );
 			console.warn( "No object selected for delete" );
 			return;
 			return;