repo: janusweb action: commit revision: path_from: revision_from: 6e3437e185e7468a85c88a00196bebd490097839: path_to: revision_to:
commit 6e3437e185e7468a85c88a00196bebd490097839 Author: James BaicoianuDate: Fri Feb 24 21:36:18 2017 -0800 Renamed MeshFaceMaterial to Multimaterial to fix material property problem diff --git a/scripts/object.js b/scripts/object.js
--- a/scripts/object.js
+++ b/scripts/object.js
@@ -262,7 +262,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
this.objects['3d'].traverse(elation.bind(this, function(n) {
if (n.material) {
var materials = [];
- if (n.material instanceof THREE.MeshFaceMaterial) {
+ if (n.material instanceof THREE.MultiMaterial) {
//materials = [n.material.materials[1]];
for (var i = 0; i < n.material.materials.length; i++) {
if (cloneMaterial) {
@@ -273,7 +273,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
}
}
if (cloneMaterial) {
- n.material = new THREE.MeshFaceMaterial(materials);
+ n.material = new THREE.MultiMaterial(materials);
} else {
n.material.materials = materials;
}
-----END OF PAGE-----