beherca
diff --git a/‎build/three.js‎
Lines changed: 21 additions & 5 deletions b/‎build/three.js‎
Lines changed: 21 additions & 5 deletions
@@ -8579,6 +8579,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 		scene: new THREE.Scene(),
 		geometries: {},
+		face_materials: {},
 		materials: {},
 		textures: {},
 		objects: {},
@@ -8726,9 +8727,22 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 						q = 0;
 
+						// use materials from the model file
+						// if there is no material specified in the object
+
 						if ( ! o.material ) {
 
-							material = new THREE.MeshFaceMaterial();
+							material = new THREE.MeshFaceMaterial( result.face_materials[ o.geometry ] );
+
+						}
+
+						// use materials from the model file
+						// if there is just empty face material
+						// (must create new material as each model has its own face material)
+
+						if ( ( material instanceof THREE.MeshFaceMaterial ) && material.materials.length === 0 ) {
+
+							material = new THREE.MeshFaceMaterial( result.face_materials[ o.geometry ] );
 
 						}
 
@@ -8943,9 +8957,10 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 	};
 
-	function handle_mesh( geo, id ) {
+	function handle_mesh( geo, mat, id ) {
 
 		result.geometries[ id ] = geo;
+		result.face_materials[ id ] = mat;
 		handle_objects();
 
 	};
@@ -8991,9 +9006,9 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 	function create_callback_geometry( id ) {
 
-		return function( geo ) {
+		return function( geo, mat ) {
 
-			handle_mesh( geo, id );
+			handle_mesh( geo, mat, id );
 
 			counter_models -= 1;
 
@@ -9046,9 +9061,10 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 	function create_callback_embed( id ) {
 
-		return function( geo ) {
+		return function( geo, mat ) {
 
 			result.geometries[ id ] = geo;
+			result.face_materials[ id ] = mat;
 
 		}