ColladaLoader: added check for existence of diffuse/emissive properti…

…es before Material creation in Shader
13911105584 · Dec 11, 2012 · b10de61 · b10de61
1 parent ed74b82
commit b10de61
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/examples/js/loaders/ColladaLoader.js b/examples/js/loaders/ColladaLoader.js
@@ -3193,21 +3193,21 @@ THREE.ColladaLoader = function () {
 
 			case 'constant':
 
-				props.color = props.emission;
+				if (props.emissive != undefined) props.color = props.emissive;
 				this.material = new THREE.MeshBasicMaterial( props );
 				break;
 
 			case 'phong':
 			case 'blinn':
 
-				props.color = props.diffuse;
+				if (props.diffuse != undefined) props.color = props.diffuse;
 				this.material = new THREE.MeshPhongMaterial( props );
 				break;
 
 			case 'lambert':
 			default:
 
-				props.color = props.diffuse;
+				if (props.diffuse != undefined) props.color = props.diffuse;
 				this.material = new THREE.MeshLambertMaterial( props );
 				break;
 
@@ -4492,4 +4492,4 @@ THREE.ColladaLoader = function () {
 
 	};
 
-};
+};