Merge branch 'master' into dev
commit 35a878442a3d3fe94c18d3c2af8089a6ead92bab
2 parents 353707d + be79482
@Matt Karl Matt Karl authored on 13 Apr 2017
Showing 4 changed files
View
src/core/textures/BaseTexture.js
View
src/core/textures/Texture.js
View
test/core/BaseTexture.js
View
test/core/Texture.js