Merge branch 'dev-multi-batch' into dev-v4.0.0
commit 861963e3b9288e15e878f4d4b998a89a1a3a776f
2 parents ca3d386 + 368f285
@Mat Groves Mat Groves authored on 16 Jan 2016
Showing 9 changed files
View
bin/pixi.js
Not supported
View
bin/pixi.js.map
View
bin/pixi.min.js 0 → 100644
View
bin/pixi.min.js.map 0 → 100644
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/sprites/webgl/generateMultiTextureShader.js 0 → 100644
View
src/core/sprites/webgl/texture.frag 0 → 100644
View
src/core/sprites/webgl/texture.vert 0 → 100644
View
src/core/textures/BaseTexture.js