allow non-scalar mix (how did mix implementation get so messed up??)

PWhiddy · web-flow · commit 6577a425438b · 2022-06-06T14:50:37.000-04:00
diff --git a/generators/sculpt.js b/generators/sculpt.js
@@ -487,7 +487,6 @@ export function sculptToGLSL(userProvidedSrc) {
         `'mix' third argument must be float or match dim of first args`
       );
     }
-    ensureScalar("mix", arg_2);
     if (typeof arg_1 == "number" || arg_1.type == "float") {
       arg_0 = tryMakeNum(arg_0);
       arg_1 = tryMakeNum(arg_1);

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,6 @@ export function sculptToGLSL(userProvidedSrc) {`
`487`	`487`	`'mix' third argument must be float or match dim of first args`
`488`	`488`	`);`
`489`	`489`	`}`
`490`		`- ensureScalar("mix", arg_2);`
`491`	`490`	`if (typeof arg_1 == "number" \|\| arg_1.type == "float") {`
`492`	`491`	`arg_0 = tryMakeNum(arg_0);`
`493`	`492`	`arg_1 = tryMakeNum(arg_1);`