Browse Source

Merge branch 'dev' of https://github.com/mrdoob/three.js into dev

Mr.doob 9 years ago
parent
commit
fc8c8ef586
2 changed files with 2 additions and 0 deletions
  1. 1 0
      src/loaders/Loader.js
  2. 1 0
      src/loaders/MaterialLoader.js

+ 1 - 0
src/loaders/Loader.js

@@ -229,6 +229,7 @@ THREE.Loader.prototype = {
 						break;
 					case 'depthTest':
 					case 'depthWrite':
+					case 'colorWrite':
 					case 'opacity':
 					case 'reflectivity':
 					case 'transparent':

+ 1 - 0
src/loaders/MaterialLoader.js

@@ -70,6 +70,7 @@ THREE.MaterialLoader.prototype = {
 		if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest;
 		if ( json.depthTest !== undefined ) material.depthTest = json.depthTest;
 		if ( json.depthWrite !== undefined ) material.depthWrite = json.depthWrite;
+		if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
 		if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
 		if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;