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/trees_with_trunks.blend.meta
+++ b/Assets/Blender/trees_with_trunks.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: 35d251ed30860a7478a010b09eba12a2
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -12,8 +14,10 @@ ModelImporter:
    400004: Icosphere_002
    400006: //RootNode
    2100000: unnamed
+
    2100002: Leaves
    2100004: Trunk
+
    2300000: Icosphere
    2300002: Icosphere_001
    2300004: Icosphere_002