Skip to content

Commit f6d9757

Browse files
julianunityjulianunity
authored
Merge pull request #8 from Unity-Technologies/release/Unity-6
Updating to Unity 6
2 parents 88b993e + 35444bf commit f6d9757

File tree

475 files changed

+2981
-2196
lines changed

Some content is hidden

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

475 files changed

+2981
-2196
lines changed

‎Assets/Art/Materials/Cars/Car_01/Accessories_01.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: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -35,7 +35,8 @@ Material:
3535
m_CustomRenderQueue: -1
3636
stringTagMap:
3737
RenderType: Opaque
38-
disabledShaderPasses: []
38+
disabledShaderPasses:
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -136,3 +137,4 @@ Material:
136137
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
137138
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
138139
m_BuildTextureStacks: []
140+
m_AllowLocking: 1

‎Assets/Art/Materials/Cars/Car_01/Bumper_01.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Material:
2121
m_CustomRenderQueue: -1
2222
stringTagMap:
2323
RenderType: Opaque
24-
disabledShaderPasses: []
24+
disabledShaderPasses:
25+
- MOTIONVECTORS
2526
m_LockedProperties:
2627
m_SavedProperties:
2728
serializedVersion: 3
@@ -122,6 +123,7 @@ Material:
122123
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
123124
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
124125
m_BuildTextureStacks: []
126+
m_AllowLocking: 1
125127
--- !u!114 &4886000610741023900
126128
MonoBehaviour:
127129
m_ObjectHideFlags: 11
@@ -134,4 +136,4 @@ MonoBehaviour:
134136
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
135137
m_Name:
136138
m_EditorClassIdentifier:
137-
version: 7
139+
version: 9

‎Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color1.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_DoubleSidedGI: 0
2020
m_CustomRenderQueue: -1
2121
stringTagMap: {}
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -177,6 +178,7 @@ Material:
177178
- _Layer2_Color: {r: 0, g: 0, b: 0, a: 0}
178179
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
179180
m_BuildTextureStacks: []
181+
m_AllowLocking: 1
180182
--- !u!114 &2275509538683177170
181183
MonoBehaviour:
182184
m_ObjectHideFlags: 11
@@ -189,4 +191,4 @@ MonoBehaviour:
189191
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
190192
m_Name:
191193
m_EditorClassIdentifier:
192-
version: 7
194+
version: 9

‎Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color2.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_DoubleSidedGI: 0
2020
m_CustomRenderQueue: -1
2121
stringTagMap: {}
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -137,6 +138,7 @@ Material:
137138
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138139
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
139140
m_BuildTextureStacks: []
141+
m_AllowLocking: 1
140142
--- !u!114 &2275509538683177170
141143
MonoBehaviour:
142144
m_ObjectHideFlags: 11
@@ -149,4 +151,4 @@ MonoBehaviour:
149151
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
150152
m_Name:
151153
m_EditorClassIdentifier:
152-
version: 7
154+
version: 9

‎Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color3.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_DoubleSidedGI: 0
2020
m_CustomRenderQueue: -1
2121
stringTagMap: {}
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -137,6 +138,7 @@ Material:
137138
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138139
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
139140
m_BuildTextureStacks: []
141+
m_AllowLocking: 1
140142
--- !u!114 &2275509538683177170
141143
MonoBehaviour:
142144
m_ObjectHideFlags: 11
@@ -149,4 +151,4 @@ MonoBehaviour:
149151
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
150152
m_Name:
151153
m_EditorClassIdentifier:
152-
version: 7
154+
version: 9

‎Assets/Art/Materials/Cars/Car_01/Colors/Car1_Color4.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_DoubleSidedGI: 0
2020
m_CustomRenderQueue: -1
2121
stringTagMap: {}
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -137,6 +138,7 @@ Material:
137138
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138139
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
139140
m_BuildTextureStacks: []
141+
m_AllowLocking: 1
140142
--- !u!114 &2275509538683177170
141143
MonoBehaviour:
142144
m_ObjectHideFlags: 11
@@ -149,4 +151,4 @@ MonoBehaviour:
149151
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
150152
m_Name:
151153
m_EditorClassIdentifier:
152-
version: 7
154+
version: 9

‎Assets/Art/Materials/Cars/Car_01/Floor.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: 9
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
@@ -133,3 +134,4 @@ Material:
133134
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
134135
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
135136
m_BuildTextureStacks: []
137+
m_AllowLocking: 1

‎Assets/Art/Materials/Cars/Car_01/Headlights_01.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: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -35,7 +35,8 @@ Material:
3535
m_CustomRenderQueue: -1
3636
stringTagMap:
3737
RenderType: Opaque
38-
disabledShaderPasses: []
38+
disabledShaderPasses:
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -136,3 +137,4 @@ Material:
136137
- _EmissionColor: {r: 13.88679, g: 9.428301, b: 2.9082284, a: 1}
137138
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
138139
m_BuildTextureStacks: []
140+
m_AllowLocking: 1

‎Assets/Art/Materials/Cars/Car_01/Rims_01.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: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -35,7 +35,8 @@ Material:
3535
m_CustomRenderQueue: -1
3636
stringTagMap:
3737
RenderType: Opaque
38-
disabledShaderPasses: []
38+
disabledShaderPasses:
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -136,3 +137,4 @@ Material:
136137
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
137138
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
138139
m_BuildTextureStacks: []
140+
m_AllowLocking: 1

‎Assets/Art/Materials/Cars/Car_01/TailLights_01.mat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Material:
2828
disabledShaderPasses:
2929
- DepthOnly
3030
- SHADOWCASTER
31+
- MOTIONVECTORS
3132
m_LockedProperties:
3233
m_SavedProperties:
3334
serializedVersion: 3
@@ -128,6 +129,7 @@ Material:
128129
- _EmissionColor: {r: 5.000013, g: 0, b: 0, a: 1}
129130
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
130131
m_BuildTextureStacks: []
132+
m_AllowLocking: 1
131133
--- !u!114 &6367158704785786816
132134
MonoBehaviour:
133135
m_ObjectHideFlags: 11
@@ -140,4 +142,4 @@ MonoBehaviour:
140142
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
141143
m_Name:
142144
m_EditorClassIdentifier:
143-
version: 7
145+
version: 9

0 commit comments

Comments
 (0)