Skip to content

Commit 4dbcbe0

Browse files
authored
Feature/task 688 recheck inspector logic when loading old material (#28)
* Fixed: eol miss match in some files. [skip ci] * Updated one material in the hdrp scene. * Fixed: Accurate renderQueue would be shown in inspector when AutoRenderQueue is selected. * Updated HDRP tests for 2020.3 and 2021.2 * Replaced some vm:gpu from 2080 to normal ones. * replaced the place to put converter source files * Deleted old menu and dsigneted gtx1080 for legacy tests. * designated rtx2080 to win legacy tests. * gtx1080 vm doesn't work for now! * no message * no message * Updated 2020.3 test project. * Updated reference 005_LightAndShadow(HDRP) reference image for 2019.4 DX11 and Vulkan. Co-authored-by: higeometry <[email protected]>
1 parent 0f7f880 commit 4dbcbe0

File tree

46 files changed

+3939
-4320
lines changed

Some content is hidden

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

46 files changed

+3939
-4320
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ utr.bat
4949

5050
# TESTS
5151
ActualImages/
52+
ActualImages.meta
5253
test-results/
53-
TestProjects/LegacyUTS_GraphicsTest/Assets/ActualImages.meta
54-
TestProjects/UniversalUTS_GraphicsTest/Assets/ActualImages.meta
55-
TestProjects/HDRPUTS_GraphicsTest/Assets/ActualImages.meta
5654

5755
# Unity3D generated meta files
5856
*.pidb.meta

.yamato/win_dx11-legacy-2021.1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ unity_versions:
1414
type: Unity::VM::GPU
1515
image: graphics-foundation/win10-dxr:stable
1616
flavor: b1.xlarge
17-
model: rtx2080
17+
model: rtx2080
1818
variables:
1919
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
2020
dependencies:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.15f2
2-
m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)
1+
m_EditorVersion: 2020.3.16f1
2+
m_EditorVersionWithRevision: 2020.3.16f1 (049d6eca3c44)

TestProjects/2.textClipping

-165 Bytes
Binary file not shown.

TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/ActualImages.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-86 Bytes
Loading
2.29 KB
Loading

TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Runtime/017_ToonShader_Emissive(HDRP).unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,13 +1395,13 @@ PrefabInstance:
13951395
- target: {fileID: 5496147082576494575, guid: 2a61f6f8c9864619a71bad897fb71e9b,
13961396
type: 3}
13971397
propertyPath: m_Materials.Array.size
1398-
value: 1
1398+
value: 2
13991399
objectReference: {fileID: 0}
14001400
- target: {fileID: 5496147082576494575, guid: 2a61f6f8c9864619a71bad897fb71e9b,
14011401
type: 3}
14021402
propertyPath: m_Materials.Array.data[1]
14031403
value:
1404-
objectReference: {fileID: 0}
1404+
objectReference: {fileID: 2100000, guid: a37e09c21bda4085896be162cffd7f90, type: 2}
14051405
- target: {fileID: 5544286281146891205, guid: 2a61f6f8c9864619a71bad897fb71e9b,
14061406
type: 3}
14071407
propertyPath: m_Enabled

TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Runtime/018_ToonShader_Firefly(HDRP).unity

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,12 @@ PrefabInstance:
21692169
- target: {fileID: 3882388472912293903, guid: 22ae8924d0014ac3b8bc815422e5d164,
21702170
type: 3}
21712171
propertyPath: m_Materials.Array.size
2172-
value: 1
2172+
value: 2
21732173
objectReference: {fileID: 0}
2174+
- target: {fileID: 3882388472912293903, guid: 22ae8924d0014ac3b8bc815422e5d164,
2175+
type: 3}
2176+
propertyPath: m_Materials.Array.data[1]
2177+
value:
2178+
objectReference: {fileID: 2100000, guid: 0b4cc8ef6a784514a03ab630f718368c, type: 2}
21742179
m_RemovedComponents: []
21752180
m_SourcePrefab: {fileID: 100100000, guid: 22ae8924d0014ac3b8bc815422e5d164, type: 3}

TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Runtime/Materials/CellTouch_ToonShader_Face_Firefly.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Material:
226226
- _Anisotropy: 0
227227
- _Ap_RimLight_FeatherOff: 0
228228
- _Ap_RimLight_Power: 0.1
229-
- _AutoRenderQueue: 1
229+
- _AutoRenderQueue: 0
230230
- _BaseColorOverridden: 0
231231
- _BaseColorVisible: 1
232232
- _BaseColor_Step: 0.631

0 commit comments

Comments
 (0)