Browse Source

replace UniformsUtils.merge

aardgoose 8 years ago
parent
commit
3c672c5c33
1 changed files with 2 additions and 2 deletions
  1. 2 2
      examples/webgl_shaders_tonemapping.html

+ 2 - 2
examples/webgl_shaders_tonemapping.html

@@ -135,12 +135,12 @@
 					// blending: THREE.AdditiveBlending,
 					// blending: THREE.AdditiveBlending,
 					transparent: true,
 					transparent: true,
 					lights: true,
 					lights: true,
-					uniforms: THREE.UniformsUtils.merge( [
+					uniforms: Object.assign( {},
 
 
 						THREE.UniformsLib[ "common" ],
 						THREE.UniformsLib[ "common" ],
 						THREE.UniformsLib[ "lights" ]
 						THREE.UniformsLib[ "lights" ]
 
 
-					] ),
+					),
 					vertexShader: [
 					vertexShader: [
 						"varying vec3 vViewPosition;",
 						"varying vec3 vViewPosition;",
 						"varying vec3 vNormal;",
 						"varying vec3 vNormal;",