From d4b3dabe142b0bbeec771674a740002361dbb167 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 8 Feb 2018 15:20:28 -0800 Subject: [PATCH] ShaderMaterial: Added uniformsNeedUpdate flag. --- src/materials/ShaderMaterial.js | 1 + src/renderers/WebGLRenderer.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/materials/ShaderMaterial.js b/src/materials/ShaderMaterial.js index f36bda198f..8ba4a23088 100644 --- a/src/materials/ShaderMaterial.js +++ b/src/materials/ShaderMaterial.js @@ -63,6 +63,7 @@ function ShaderMaterial( parameters ) { }; this.index0AttributeName = undefined; + this.uniformsNeedUpdate = false; if ( parameters !== undefined ) { diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 0c2afafe1c..9bd261742e 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -1931,6 +1931,12 @@ function WebGLRenderer( parameters ) { } + if ( material.isShaderMaterial && material.uniformsNeedUpdate === true ) { + + WebGLUniforms.upload( _gl, materialProperties.uniformsList, m_uniforms, _this ); + material.uniformsNeedUpdate = false; + + } // common matrices -- GitLab