Skip to content

Commit 7f6e14b

Browse files
maxwildersmithmaxwildersmith
committed
bump to Unity 6
1 parent 85cad70 commit 7f6e14b

File tree

568 files changed

+94657
-21231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

568 files changed

+94657
-21231
lines changed

‎Assets/Components/CameraView/Materials/UnlitTexture.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -120,6 +121,7 @@ Material:
120121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
121122
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
123125
--- !u!114 &9004642721467294702
124126
MonoBehaviour:
125127
m_ObjectHideFlags: 11
@@ -132,4 +134,4 @@ MonoBehaviour:
132134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
133135
m_Name:
134136
m_EditorClassIdentifier:
135-
version: 7
137+
version: 10

‎Assets/Components/Hands/HandModel/Materials/Default.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -118,6 +119,7 @@ Material:
118119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119120
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120121
m_BuildTextureStacks: []
122+
m_AllowLocking: 1
121123
--- !u!114 &5205573664616634089
122124
MonoBehaviour:
123125
m_ObjectHideFlags: 11
@@ -130,4 +132,4 @@ MonoBehaviour:
130132
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131133
m_Name:
132134
m_EditorClassIdentifier:
133-
version: 7
135+
version: 10

‎Assets/Components/Hands/HandModel/Materials/black.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -118,6 +119,7 @@ Material:
118119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119120
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120121
m_BuildTextureStacks: []
122+
m_AllowLocking: 1
121123
--- !u!114 &2972951403565025789
122124
MonoBehaviour:
123125
m_ObjectHideFlags: 11
@@ -130,4 +132,4 @@ MonoBehaviour:
130132
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131133
m_Name:
132134
m_EditorClassIdentifier:
133-
version: 7
135+
version: 10

‎Assets/Components/Hands/HandModel/Materials/carbonFiber.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -118,6 +119,7 @@ Material:
118119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119120
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120121
m_BuildTextureStacks: []
122+
m_AllowLocking: 1
121123
--- !u!114 &2784402008379093849
122124
MonoBehaviour:
123125
m_ObjectHideFlags: 11
@@ -130,4 +132,4 @@ MonoBehaviour:
130132
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131133
m_Name:
132134
m_EditorClassIdentifier:
133-
version: 7
135+
version: 10

‎Assets/Components/Haptics/Materials/monolith.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 10
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -131,3 +132,4 @@ Material:
131132
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132133
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133134
m_BuildTextureStacks: []
135+
m_AllowLocking: 1

‎Assets/Components/Markers/Materials/LineMaterial.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -120,6 +121,7 @@ Material:
120121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
121122
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
123125
--- !u!114 &6519446343393031679
124126
MonoBehaviour:
125127
m_ObjectHideFlags: 11
@@ -132,4 +134,4 @@ MonoBehaviour:
132134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
133135
m_Name:
134136
m_EditorClassIdentifier:
135-
version: 7
137+
version: 10

‎Assets/Components/Menu/Materials/Ends.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -120,6 +121,7 @@ Material:
120121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
121122
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
122123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
123125
--- !u!114 &777128047264706818
124126
MonoBehaviour:
125127
m_ObjectHideFlags: 11
@@ -132,4 +134,4 @@ MonoBehaviour:
132134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
133135
m_Name:
134136
m_EditorClassIdentifier:
135-
version: 7
137+
version: 10

‎Assets/Components/Menu/Materials/Frame.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -118,6 +119,7 @@ Material:
118119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119120
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120121
m_BuildTextureStacks: []
122+
m_AllowLocking: 1
121123
--- !u!114 &8398621684991666232
122124
MonoBehaviour:
123125
m_ObjectHideFlags: 11
@@ -130,4 +132,4 @@ MonoBehaviour:
130132
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131133
m_Name:
132134
m_EditorClassIdentifier:
133-
version: 7
135+
version: 10

‎Assets/Components/Menu/Materials/TransparentPlate.mat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Material:
2727
disabledShaderPasses:
2828
- DepthOnly
2929
- SHADOWCASTER
30+
- MOTIONVECTORS
3031
m_LockedProperties:
3132
m_SavedProperties:
3233
serializedVersion: 3
@@ -125,6 +126,7 @@ Material:
125126
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
126127
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
127128
m_BuildTextureStacks: []
129+
m_AllowLocking: 1
128130
--- !u!114 &6428200517535121717
129131
MonoBehaviour:
130132
m_ObjectHideFlags: 11
@@ -137,4 +139,4 @@ MonoBehaviour:
137139
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
138140
m_Name:
139141
m_EditorClassIdentifier:
140-
version: 7
142+
version: 10

‎Assets/Components/NeRFViewer/Materials/DepthMat-Flat.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 10
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_DoubleSidedGI: 0
3333
m_CustomRenderQueue: -1
3434
stringTagMap: {}
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -46,3 +47,4 @@ Material:
4647
- _Progress: 1
4748
m_Colors: []
4849
m_BuildTextureStacks: []
50+
m_AllowLocking: 1

0 commit comments

Comments
 (0)