浏览代码

Moved material name handling from ObjectExporter to MaterialExporter.

Mr.doob 12 年之前
父节点
当前提交
cb2ff24a24
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 2 0
      examples/js/exporters/MaterialExporter.js
  2. 0 2
      examples/js/exporters/ObjectExporter.js

+ 2 - 0
examples/js/exporters/MaterialExporter.js

@@ -18,6 +18,8 @@ THREE.MaterialExporter.prototype = {
 			}
 			}
 		};
 		};
 
 
+		if ( material.name !== "" ) output.name = material.name;
+
 		if ( material instanceof THREE.MeshBasicMaterial ) {
 		if ( material instanceof THREE.MeshBasicMaterial ) {
 
 
 			output.type = 'MeshBasicMaterial';
 			output.type = 'MeshBasicMaterial';

+ 0 - 2
examples/js/exporters/ObjectExporter.js

@@ -142,8 +142,6 @@ THREE.ObjectExporter.prototype = {
 
 
 				var data = materialExporter.parse( material );
 				var data = materialExporter.parse( material );
 
 
-				if ( material.name !== "" ) data.name = material.name;
-
 				delete data.metadata;
 				delete data.metadata;
 
 
 				output.materials.push( data );
 				output.materials.push( data );