提交 aa9193e4 编写于 作者: M Mikael Emtinger

Fixed bug that caused env-maps and cube maps to break.

上级 7816ffe1
...@@ -2401,7 +2401,7 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -2401,7 +2401,7 @@ THREE.WebGLRenderer = function ( parameters ) {
material instanceof THREE.MeshPhongMaterial || material instanceof THREE.MeshPhongMaterial ||
material.envMap ) { material.envMap ) {
if( p_uniforms.cameraPosition >= 0 ) { if( p_uniforms.cameraPosition !== null ) {
_gl.uniform3f( p_uniforms.cameraPosition, camera.position.x, camera.position.y, camera.position.z ); _gl.uniform3f( p_uniforms.cameraPosition, camera.position.x, camera.position.y, camera.position.z );
...@@ -2413,7 +2413,7 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -2413,7 +2413,7 @@ THREE.WebGLRenderer = function ( parameters ) {
material.envMap || material.envMap ||
material.skinning ) { material.skinning ) {
if ( p_uniforms.objectMatrix >= 0 ) { if ( p_uniforms.objectMatrix !== null ) {
_gl.uniformMatrix4fv( p_uniforms.objectMatrix, false, object._objectMatrixArray ); _gl.uniformMatrix4fv( p_uniforms.objectMatrix, false, object._objectMatrixArray );
...@@ -2426,7 +2426,7 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -2426,7 +2426,7 @@ THREE.WebGLRenderer = function ( parameters ) {
material instanceof THREE.MeshShaderMaterial || material instanceof THREE.MeshShaderMaterial ||
material.skinning ) { material.skinning ) {
if( p_uniforms.viewMatrix >= 0 ) { if( p_uniforms.viewMatrix !== null ) {
_gl.uniformMatrix4fv( p_uniforms.viewMatrix, false, _viewMatrixArray ); _gl.uniformMatrix4fv( p_uniforms.viewMatrix, false, _viewMatrixArray );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册