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/rock_wall_stepped.blend.meta
+++ b/Assets/Blender/rock_wall_stepped.blend.meta
@@ -1,13 +1,16 @@
 fileFormatVersion: 2
+
 guid: 743de541888a4014c912500b676649b4
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-    2100000: Material
-    2100002: Rock
-    2100004: Top
+
+    2100000: Rock
+    2100002: Top
+
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube