浏览代码

Merge pull request #18578 from Mugen87/dev26

Editor: Make "Minify Shaders" option more robust.
Mr.doob 5 年之前
父节点
当前提交
9c601f527a
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      editor/js/Menubar.Edit.js

+ 5 - 4
editor/js/Menubar.Edit.js

@@ -118,10 +118,11 @@ var MenubarEdit = function ( editor ) {
 
 		var object = editor.selected;
 
-		var parent = object.parent;
-		if ( parent === undefined ) return; // avoid deleting the camera or scene
+		if ( object !== null && object.parent !== null ) {
 
-		editor.execute( new RemoveObjectCommand( editor, object ) );
+			editor.execute( new RemoveObjectCommand( editor, object ) );
+
+		}
 
 	} );
 	options.add( option );
@@ -158,7 +159,7 @@ var MenubarEdit = function ( editor ) {
 
 			var material = object.material;
 
-			if ( material.isShaderMaterial ) {
+			if ( material !== undefined && material.isShaderMaterial ) {
 
 				try {