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

… to set2iv
snagy · Sep 20, 2022 · aa17433 · aa17433
1 parent 20bd138
commit aa17433
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build/three.cjs b/build/three.cjs
@@ -12806,7 +12806,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
@@ -12808,7 +12808,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.module.js b/build/three.module.js
@@ -16764,7 +16764,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
@@ -169,7 +169,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 {