rename affine_on to affine per wg21
#1993
+23
−19
Merged