From 6252b6fa593c3f1c7c2a324ac2223ff9d111631a Mon Sep 17 00:00:00 2001
From: "Mr.doob" <info@mrdoob.com>
Date: Thu, 30 Mar 2017 19:51:57 -0700
Subject: [PATCH] Editor: Minimal MultiMaterial support. See #10931

---
 editor/js/Sidebar.Material.js |  3 ++-
 editor/js/Sidebar.Scene.js    | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/editor/js/Sidebar.Material.js b/editor/js/Sidebar.Material.js
index 7a1914b898..421d39cf9a 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 105ac62115..dfb4c8ee72 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 = '<span class="type ' + object.type + '"></span> ' + object.name;
@@ -33,7 +53,7 @@ Sidebar.Scene = function ( editor ) {
 			var material = object.material;
 
 			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 );
 
 		}
 
-- 
GitLab