Merge branch 'master' into level_detail_bc

2018-09-02 21:03:34 +02:00
parent 497c653196 735d943773
commit e7054d137e
45 changed files with 18609 additions and 4548 deletions
--- a/Assets/Images/2DAssets/Materials.meta
+++ b/Assets/Images/2DAssets/Materials.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: 53aaf38ae06c34e4391b539bb0045ca1
+
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}