Merge branch 'master' into dev
commit e387786d55608700c3b86dcf27949c727cc68d56
2 parents f23089f + 06d4abf
@Matt Karl Matt Karl authored on 13 Mar 2017
Showing 4 changed files
View
src/core/display/DisplayObject.js
View
src/core/textures/BaseTexture.js
View
src/prepare/BasePrepare.js
View
test/prepare/BasePrepare.js