diff --git a/editor/js/Sidebar.Material.js b/editor/js/Sidebar.Material.js index 7a1914b8984290d6b38f45e5a207c51fe4b0f2eb..421d39cf9ae5404304bb465f9fb2862d3e53d075 100644 --- a/editor/js/Sidebar.Material.js +++ b/editor/js/Sidebar.Material.js @@ -1279,7 +1279,8 @@ Sidebar.Material = function ( editor ) { signals.objectSelected.add( function ( object ) { - if ( object && object.material ) { + if ( object && object.material && + Array.isArray( object.material ) === false ) { var objectChanged = object !== currentObject; diff --git a/editor/js/Sidebar.Scene.js b/editor/js/Sidebar.Scene.js index 105ac62115f847c8f28d76b0de37ff10314c3d17..dfb4c8ee72ae938791f7e734ec81f510eb9b9e17 100644 --- a/editor/js/Sidebar.Scene.js +++ b/editor/js/Sidebar.Scene.js @@ -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 ) { var html = ' ' + object.name; @@ -33,7 +53,7 @@ Sidebar.Scene = function ( editor ) { var material = object.material; html += ' ' + geometry.name; - html += ' ' + material.name; + html += ' ' + getMaterialName( material ); }