Merge branch 'master' into BLOOM

This commit is contained in:
Michael 2017-10-07 16:59:38 -07:00
commit e6814c5d28

View File

@ -6,6 +6,7 @@ version = 2
[TextureRedefine] [TextureRedefine]
width = 360 width = 360
height = 360 height = 360
formats = 0x005
overwriteWidth = 360 overwriteWidth = 360
overwriteHeight = 360 overwriteHeight = 360