Fix where morphtargets were passing a vector2 instead of a flat array…

… to set2iv
snagy · Sep 1, 2022 · 6f15682 · 6f15682
1 parent d9d3eb3
commit 6f15682
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build/three.cjs b/build/three.cjs
@@ -12985,7 +12985,7 @@ function WebGLMorphtargets(gl, capabilities, textures) {
 			program.getUniforms().setValue(gl, 'morphTargetBaseInfluence', morphBaseInfluence);
 			program.getUniforms().setValue(gl, 'morphTargetInfluences', objectInfluences);
 			program.getUniforms().setValue(gl, 'morphTargetsTexture', entry.texture, textures);
-			program.getUniforms().setValue(gl, 'morphTargetsTextureSize', entry.size);
+			program.getUniforms().setValue(gl, 'morphTargetsTextureSize', [entry.size.x, entry.size.y]);
 		} else {
 			// When object doesn't have morph target influences defined, we treat it as a 0-length array
 			// This is important to make sure we set up morphTargetBaseInfluence / morphTargetInfluences

diff --git a/build/three.js b/build/three.js
@@ -12987,7 +12987,7 @@
 				program.getUniforms().setValue(gl, 'morphTargetBaseInfluence', morphBaseInfluence);
 				program.getUniforms().setValue(gl, 'morphTargetInfluences', objectInfluences);
 				program.getUniforms().setValue(gl, 'morphTargetsTexture', entry.texture, textures);
-				program.getUniforms().setValue(gl, 'morphTargetsTextureSize', entry.size);
+				program.getUniforms().setValue(gl, 'morphTargetsTextureSize', [entry.size.x, entry.size.y]);
 			} else {
 				// When object doesn't have morph target influences defined, we treat it as a 0-length array
 				// This is important to make sure we set up morphTargetBaseInfluence / morphTargetInfluences

diff --git a/build/three.min.js b/build/three.min.js
diff --git a/build/three.module.js b/build/three.module.js
@@ -16999,7 +16999,7 @@ function WebGLMorphtargets( gl, capabilities, textures ) {
 			program.getUniforms().setValue( gl, 'morphTargetInfluences', objectInfluences );
 
 			program.getUniforms().setValue( gl, 'morphTargetsTexture', entry.texture, textures );
-			program.getUniforms().setValue( gl, 'morphTargetsTextureSize', entry.size );
+			program.getUniforms().setValue( gl, 'morphTargetsTextureSize', [entry.size.x, entry.size.y] );
 
 
 		} else {

diff --git a/src/renderers/webgl/WebGLMorphtargets.js b/src/renderers/webgl/WebGLMorphtargets.js
@@ -189,7 +189,7 @@ function WebGLMorphtargets( gl, capabilities, textures ) {
 			program.getUniforms().setValue( gl, 'morphTargetInfluences', objectInfluences );
 
 			program.getUniforms().setValue( gl, 'morphTargetsTexture', entry.texture, textures );
-			program.getUniforms().setValue( gl, 'morphTargetsTextureSize', entry.size );
+			program.getUniforms().setValue( gl, 'morphTargetsTextureSize', [entry.size.x, entry.size.y] );
 
 
 		} else {