提交 6252b6fa 编写于 作者: M Mr.doob

Editor: Minimal MultiMaterial support. See #10931

上级 7de1d68c
...@@ -1279,7 +1279,8 @@ Sidebar.Material = function ( editor ) { ...@@ -1279,7 +1279,8 @@ Sidebar.Material = function ( editor ) {
signals.objectSelected.add( function ( object ) { signals.objectSelected.add( function ( object ) {
if ( object && object.material ) { if ( object && object.material &&
Array.isArray( object.material ) === false ) {
var objectChanged = object !== currentObject; var objectChanged = object !== currentObject;
......
...@@ -23,6 +23,26 @@ Sidebar.Scene = function ( editor ) { ...@@ -23,6 +23,26 @@ Sidebar.Scene = function ( editor ) {
} }
function getMaterialName( material ) {
if ( Array.isArray( material ) ) {
var array = [];
for ( var i = 0; i < material.length; i ++ ) {
array.push( material[ i ].name );
}
return array.join( ',' );
}
return material.name;
}
function buildHTML( object ) { function buildHTML( object ) {
var html = '<span class="type ' + object.type + '"></span> ' + object.name; var html = '<span class="type ' + object.type + '"></span> ' + object.name;
...@@ -33,7 +53,7 @@ Sidebar.Scene = function ( editor ) { ...@@ -33,7 +53,7 @@ Sidebar.Scene = function ( editor ) {
var material = object.material; var material = object.material;
html += ' <span class="type ' + geometry.type + '"></span> ' + geometry.name; html += ' <span class="type ' + geometry.type + '"></span> ' + geometry.name;
html += ' <span class="type ' + material.type + '"></span> ' + material.name; html += ' <span class="type ' + material.type + '"></span> ' + getMaterialName( material );
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册