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/Blender/rocks01.blend.meta
+++ b/Assets/Blender/rocks01.blend.meta
@@ -65,6 +65,7 @@ ModelImporter:
    7400000: Default Take
    9500000: //RootNode
    2186277476908879412: ImportLogs
+
  externalObjects: {}
  materials:
    importMaterials: 1