- solidify/face.h (z0_scale, fx_to_angle, fy_to_angle, fx_from_angle, fy_from_angle): correct for z vs. xy scale differences - solidify/overlap.c (merge_matrix): correct z0 shrinkage for z vs. xy scale differences