diff options
author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-05 19:53:02 +0000 |
---|---|---|
committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-05 19:53:02 +0000 |
commit | b84d4cc6b9c97874a958bc28ae2d6fd0da9bd833 (patch) | |
tree | 51fb2a639e51af9aa38fc694ae9b41ba123a096f /Gem/examples/10.glsl/06.rectangle_multitexture.pd | |
parent | 48351101d6169c18542224f9efa8d26f0af4201a (diff) |
Gem ff2a6654059bb2881be49407cfaaee188a9aec42 osx/i386
built 'master:ff2a6654059bb2881be49407cfaaee188a9aec42' for osx/i386
Diffstat (limited to 'Gem/examples/10.glsl/06.rectangle_multitexture.pd')
-rw-r--r-- | Gem/examples/10.glsl/06.rectangle_multitexture.pd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gem/examples/10.glsl/06.rectangle_multitexture.pd b/Gem/examples/10.glsl/06.rectangle_multitexture.pd index 48e6600..235e888 100644 --- a/Gem/examples/10.glsl/06.rectangle_multitexture.pd +++ b/Gem/examples/10.glsl/06.rectangle_multitexture.pd @@ -132,12 +132,12 @@ for crossfading); #X connect 6 0 4 0; #X connect 7 0 6 0; #X restore 106 559 pd onebang; -#X text 206 357 <- 2 : test differents mix; +#X text 206 357 <- 2 : test different mix; #X obj 459 167 pix_resize 512 512; #X obj 279 167 pix_resize 234 543; #X obj 279 147 pix_image img3.jpg; #X obj 459 147 pix_image img2.jpg; -#X text 292 186 images have diferents sizes; +#X text 292 186 images have different sizes; #X msg 139 507 mix_factor \$1; #X obj 37 646 square 4; #X connect 0 0 61 0; |