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/_tree_top.blend.meta
+++ b/_tree_top.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
-guid: bdc19e1d93c9c664ab7f282795b2b038
+
+guid: 92769698617cda944a6083e435fee3e4
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/longplateau_horizontal.blend.meta
+++ b/Assets/Blender/longplateau_horizontal.blend.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: f8a9b47e26adf7341996b9467a94f551
+
+guid: 3b6832ff1a40a4445af6fd2a4de420b9
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/rock_wall01.blend.meta
+++ b/Assets/Blender/rock_wall01.blend.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: dbdfb03b6c3680d428f8903b4434a236
+
+guid: 701478431802b1143ae792147b8cbe91
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/rock_wall_edge.blend.meta
+++ b/Assets/Blender/rock_wall_edge.blend.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 9ce16e413ddf64b45b624f04e77768ab
+
+guid: a407b81221217314cb2f3f58d53416b6
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -9,7 +10,7 @@ ModelImporter:
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
-    6400000: //RootNode
+
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
@@ -46,6 +47,7 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 1
+
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
--- a/Assets/Blender/rock_wall_ridge.blend.meta
+++ b/Assets/Blender/rock_wall_ridge.blend.meta
@@ -1,13 +1,16 @@
 fileFormatVersion: 2
+
 guid: d336f86cc18e4c646a8f4ee463e65728
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-    2100000: Material
-    2100002: Bottom
-    2100004: Top
+
+    2100000: Bottom
+    2100002: Top
+
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
--- 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
--- 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
--- a/Assets/Blender/spikertap1.blend.meta
+++ b/Assets/Blender/spikertap1.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: 606d416790688a04bbc4000f9b15bafa
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_platform.blend.meta
+++ b/Assets/Blender/tree_platform.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: e19e7453725b19e4e989432893eb38d1
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_tops.blend.meta
+++ b/Assets/Blender/tree_tops.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: b2571f564af29ac4aba093136c5074ae
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- 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
--- a/Assets/Blender/trunk.blend.meta
+++ b/Assets/Blender/trunk.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: 2c4683743c15c5b4da69008ce599c18b
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/waves.blend.meta
+++ b/Assets/Blender/waves.blend.meta
@@ -1,5 +1,7 @@
 fileFormatVersion: 2
+
 guid: be524af1caf68134f82b9c43ce1db13e
+
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -8,42 +10,52 @@ ModelImporter:
    100004: Cube_002
    100006: Cube_003
    100008: Cube_004
+
    100010: Cube_005
    100012: Cube_006
    100014: //RootNode
+r
    400000: Cube_000
    400002: Cube_001
    400004: Cube_002
    400006: Cube_003
    400008: Cube_004
+
    400010: Cube_005
    400012: Cube_006
    400014: //RootNode
+
    2100000: unnamed
    2300000: Cube_000
    2300002: Cube_001
    2300004: Cube_002
    2300006: Cube_003
    2300008: Cube_004
+
    2300010: Cube_005
    2300012: Cube_006
+
    3300000: Cube_000
    3300002: Cube_001
    3300004: Cube_002
    3300006: Cube_003
    3300008: Cube_004
+
    3300010: Cube_005
    3300012: Cube_006
+
    4300000: Cube_006
    4300002: Cube_004
    4300004: Cube_003
    4300006: Cube_002
    4300008: Cube_001
    4300010: Cube_000
+
    4300012: Cube_005
    7400000: Default Take
    9500000: //RootNode
    2186277476908879412: ImportLogs
+
  externalObjects: {}
  materials:
    importMaterials: 1