Browse Source

Updated builds.

Mr.doob 8 years ago
parent
commit
810e607d75
3 changed files with 5 additions and 5 deletions
  1. 2 2
      build/three.js
  2. 1 1
      build/three.min.js
  3. 2 2
      build/three.modules.js

+ 2 - 2
build/three.js

@@ -4963,10 +4963,10 @@
 
 					var parameter_src = uniforms_src[ u ][ p ];
 
-					if ( parameter_src.isColor ||
+					if ( parameter_src && ( parameter_src.isColor ||
 						parameter_src.isMatrix3 || parameter_src.isMatrix4 ||
 						parameter_src.isVector2 || parameter_src.isVector3 || parameter_src.isVector4 ||
-						parameter_src.isTexture ) {
+						parameter_src.isTexture ) ) {
 
 						uniforms_dst[ u ][ p ] = parameter_src.clone();
 

File diff suppressed because it is too large
+ 1 - 1
build/three.min.js


+ 2 - 2
build/three.modules.js

@@ -4957,10 +4957,10 @@ var UniformsUtils = {
 
 				var parameter_src = uniforms_src[ u ][ p ];
 
-				if ( parameter_src.isColor ||
+				if ( parameter_src && ( parameter_src.isColor ||
 					parameter_src.isMatrix3 || parameter_src.isMatrix4 ||
 					parameter_src.isVector2 || parameter_src.isVector3 || parameter_src.isVector4 ||
-					parameter_src.isTexture ) {
+					parameter_src.isTexture ) ) {
 
 					uniforms_dst[ u ][ p ] = parameter_src.clone();
 

Some files were not shown because too many files changed in this diff