Merge pull request Unity-Technologies#288 from Unity-Technologies/upd…

…ate-physics-1.2

update physics samples to 1.2.1

PhysicsSamples/Assets/1. Hello World/Subscenes/SphereAndBoxCollidersSubscene.unity

@@ -441,6 +441,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 595744515}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0.25, y: 5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -449,7 +450,6 @@ Transform:
   - {fileID: 1124627267}
   - {fileID: 558213329}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1001 &670284648
 PrefabInstance:
@@ -640,7 +640,8 @@ PrefabInstance:
     - target: {fileID: 2300000, guid: 2caa94c2700d4354e95168f4cd6c88e0, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 469ae02a6ec15ab418ae78f229d72ad9, type: 2}
+      objectReference: {fileID: -876546973899608171, guid: 8dc7dbc71661e446f92b6183222bc66f,
+        type: 3}
     - target: {fileID: 2300000, guid: 2caa94c2700d4354e95168f4cd6c88e0, type: 3}
       propertyPath: m_Materials.Array.data[1]
       value: 
@@ -911,7 +912,8 @@ PrefabInstance:
     - target: {fileID: 2300000, guid: 2caa94c2700d4354e95168f4cd6c88e0, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 469ae02a6ec15ab418ae78f229d72ad9, type: 2}
+      objectReference: {fileID: -876546973899608171, guid: 8dc7dbc71661e446f92b6183222bc66f,
+        type: 3}
     - target: {fileID: 3300000, guid: 2caa94c2700d4354e95168f4cd6c88e0, type: 3}
       propertyPath: m_Mesh
       value: 
@@ -1028,13 +1030,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688397174}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &2034115798 stripped
 Transform:
@@ -1117,6 +1119,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2067443213}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 2, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1125,7 +1128,6 @@ Transform:
   - {fileID: 2034115798}
   - {fileID: 1310232525}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1001 &2103490620
 PrefabInstance:
@@ -1198,3 +1200,11 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2103490620}
   m_PrefabAsset: {fileID: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 670284648}
+  - {fileID: 595744517}
+  - {fileID: 2067443216}
+  - {fileID: 1688397180}