Skip to content

Commit

Permalink
Revert "Merge branch 'main' into nanna"
Browse files Browse the repository at this point in the history
This reverts commit ef098b9, reversing
changes made to af96708.
  • Loading branch information
elimvb committed Aug 18, 2022
1 parent ef098b9 commit 7f79e43
Show file tree
Hide file tree
Showing 124 changed files with 8,895 additions and 4,051 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -517,7 +516,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -538,7 +538,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1807231370777324
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1090,7 +1089,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -1111,4 +1111,3 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -753,7 +752,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -774,7 +774,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1487588795739886
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -475,7 +474,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -496,7 +496,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1374785792251946
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -768,7 +767,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -789,7 +789,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1651291774582614
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -480,7 +479,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -501,7 +501,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1516635410546996
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1217,7 +1216,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -1238,7 +1238,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1985779809521002
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -749,7 +748,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -770,7 +770,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1919200954734260
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -400,7 +399,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -421,7 +421,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1439168396335346
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1090,7 +1089,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -1111,7 +1111,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1992309886029666
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -138,7 +137,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -159,7 +159,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1235872635496554
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -313,7 +312,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -334,7 +334,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1461849855286782
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1033,7 +1032,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -1054,7 +1054,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1914245025429406
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -674,7 +673,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -695,7 +695,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1543426664055330
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -104,7 +103,8 @@ MeshRenderer:
- {fileID: 2100000, guid: 8617199c947374e8a84dd39cdfab7665, type: 2}
- {fileID: 2100000, guid: 7b43429e3be6b44f5b9983fc081e01e0, type: 2}
- {fileID: 2100000, guid: b0741133b63bf4fc4b53a926d02f26b0, type: 2}
- {fileID: -2088452910793887279, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100010, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
- {fileID: 2100012, guid: 109050b07e46147a6baf9833ef8b63ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -125,7 +125,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1077441100736524
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 7f79e43

Please sign in to comment.