Merge branch 'master' into dev
commit 33536c0637b1180d49fc90bc12c22689b7de872c
2 parents 8821e4c + f3da834
@Matt Karl Matt Karl authored on 24 Jul 2017
Showing 2 changed files
View
src/extras/webgl/tilingSprite.frag
View
src/extras/webgl/tilingSprite_simple.frag