From 14ec985212603c2367786ca9c5e7369182d5f043 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 18:33:02 +0300 Subject: [PATCH 01/12] Upgraded Runtime/Materials/*.mat files. --- .../Runtime/Materials/Lit.mat | 5 ++++- .../Runtime/Materials/ParticlesUnlit.mat | 2 +- .../Runtime/Materials/SimpleLit.mat | 5 ++++- .../Runtime/Materials/TerrainLit.mat | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat index ee75030f91f..5d5b98d5038 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat index 4ca9d8e0f01..55ead432b37 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat index 2acc4b70dd8..1d7d18b485b 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat @@ -76,11 +76,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -97,6 +99,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -118,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat index b16235f562b..6cc5dc38d14 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 From 7f8d94161c4d611c5a6488e50e5231bca9708430 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 18:36:21 +0300 Subject: [PATCH 02/12] Foundation CommonAssets/ *.mat files upgrade. --- .../CommonAssets/Materials/CeramicTiles.mat | 19 ++++++++++++++++- .../Materials/Challenge-Brick.mat | 19 ++++++++++++++++- .../CommonAssets/Materials/Hole_mesh.mat | 21 +++++++++++++++++-- .../Materials/Hole_mesh_cutout.mat | 7 +++++-- .../Materials/IndustrialGlass.mat | 8 +++++-- .../CommonAssets/Materials/LW_Diffuse.mat | 19 +++++++++++++++-- .../Materials/LW_DiffuseParticles.mat | 4 ++-- .../LW_DiffuseParticlesWithTexture.mat | 4 ++-- .../Materials/LW_DiffuseTransparent.mat | 10 ++++++--- .../LW_DiffuseTransparentParticles.mat | 7 ++++--- ...DiffuseTransparentParticlesWithTexture.mat | 7 ++++--- .../LW_DiffuseTransparentWithTexture.mat | 10 ++++++--- .../Materials/LW_DiffuseUnlit.mat | 7 +++++-- ...seUnlitParticlesTransparentWithTexture.mat | 7 ++++--- .../LW_DiffuseUnlitParticlesWithTexture.mat | 4 ++-- .../Materials/LW_DiffuseUnlitShaderGraph.mat | 17 ++++++++++++++- .../LW_DiffuseUnlitTransparentWithTexture.mat | 9 +++++--- .../Materials/LW_DiffuseUnlitWithTexture.mat | 7 +++++-- .../Materials/LW_DiffuseWithTexture.mat | 19 +++++++++++++++-- .../CommonAssets/Materials/LW_Material.mat | 19 ++++++++++++++++- .../Materials/LW_MaterialParticles.mat | 7 +++++-- .../LW_MaterialParticlesWithTexture.mat | 7 +++++-- .../Materials/LW_MaterialShaderGraph.mat | 17 ++++++++++++++- .../Materials/LW_MaterialTransparent.mat | 10 ++++++--- .../LW_MaterialTransparentParticles.mat | 10 ++++++--- ...aterialTransparentParticlesWithTexture.mat | 10 ++++++--- .../LW_MaterialTransparentShaderGraph.mat | 17 ++++++++++++++- .../LW_MaterialTransparentWithTexture.mat | 10 ++++++--- .../Materials/LW_MaterialWithTexture.mat | 21 +++++++++++++++++-- .../CommonAssets/Materials/PW_WoodLog.mat | 19 ++++++++++++++++- .../Materials/PyramidsWall-v01.mat | 5 ++++- .../Assets/CommonAssets/Materials/Roofing.mat | 19 ++++++++++++++++- .../CommonAssets/Materials/ShoreRockSand.mat | 19 ++++++++++++++++- .../CommonAssets/Materials/UnlitColor.mat | 5 ++++- .../Assets/CommonAssets/Materials/bark.mat | 19 ++++++++++++++++- .../Materials/herringbone_brick_floor.mat | 19 ++++++++++++++++- .../Materials/metal_aluminium_directional.mat | 19 ++++++++++++++++- .../Materials/metal_brushed_copper.mat | 19 ++++++++++++++++- .../CommonAssets/Materials/red_paint.mat | 19 ++++++++++++++++- .../Materials/rocks_dirt_ground.mat | 19 ++++++++++++++++- .../Crowd_LOD0_Mat_Limbs_metallic.mat | 19 ++++++++++++++++- .../Materials/Crowd_LOD0_Mat_Limbs_spec.mat | 19 ++++++++++++++++- .../Crowd_LOD0_Mat_Torso_metallic.mat | 19 ++++++++++++++++- .../Materials/Crowd_LOD0_Mat_Torso_spec.mat | 19 ++++++++++++++++- .../Meshes/PBRSpheres/PBRtest_Spec.mat | 19 ++++++++++++++++- .../Meshes/PBRSpheres/PBRtest_met.mat | 19 ++++++++++++++++- 46 files changed, 549 insertions(+), 79 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat index a8480b79015..ba50091c0d3 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat index 6a626d9ae33..e5c0c4916e8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat index 001ce8cb0e5..e82e01b9eee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 0 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index 92544bbd192..83911281f63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,11 +89,13 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -113,6 +115,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat index 0afc52678c8..fca311b740e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat @@ -13,11 +13,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -93,6 +94,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -102,6 +104,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,6 +123,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -142,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat index de163d1d71f..7eea823dd5f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -69,15 +69,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -92,12 +106,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat index 475f943b57b..e8d97caaa20 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,7 +123,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat index a4e33155c2c..40673b4c60f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,7 +123,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat index 6c3f40235a0..7301b437303 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,11 +87,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -105,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat index 157bd6086b6..7ba4dee6294 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat index eba0db94cbb..93d0e501f98 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat index a30ad27f662..c6b8ed38399 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,11 +87,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -105,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat index 9164380b026..95db44b2a57 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -104,13 +106,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat index e61d0ccf8c9..50e2c886396 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -128,7 +129,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat index ab12f6c343c..194fa4c25d5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -127,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat index d6344caf7ef..ecd63f89e6a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -93,6 +106,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 @@ -112,3 +126,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat index 0b8cf53b0b0..a060bbec41f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -88,6 +89,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -106,13 +108,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat index 918e3ddc1ee..6250a61f3df 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -104,13 +106,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat index 08920ad08e9..baef52eb7fa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -69,15 +69,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -92,12 +106,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat index 371e2b1a2de..14b20a2b4aa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat index 9eb8d5ce5af..d0bdc74a49a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,6 +81,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -95,6 +96,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -122,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat index 0c3be0094bd..4b1d5a14e0c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,6 +81,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -95,6 +96,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -122,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat index d6221963ca2..ebc42bcdb93 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -92,6 +105,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -107,3 +121,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat index e0dae12071e..74b9607bb29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +99,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,13 +123,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat index 429f764dff1..1a240712c7a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -82,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -96,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -123,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat index 72b91925568..ab3a0aa265c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -82,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -96,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -123,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat index 7d1bc9c87fc..1fe12ff932f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -92,6 +105,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -107,3 +121,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat index 67ba0f96567..6cf2b5e0c9a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +99,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,13 +123,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat index 7ebee4d4007..af98fb394d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,13 +121,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat index 7e319939d87..6e748b2425e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat index b4735bb2a41..525655678a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -141,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat index 56b96e0aa9f..e2991537e73 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat index 87497fc33ad..0b8bb88b1a7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat index 92ac58db5e1..7a441d35596 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,6 +84,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat index ca820260692..9e9afde2788 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat index 21ebd563ccd..cac2d6524a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat index 144de54c7c0..9cb25e366cc 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat index d318fed0c40..a4e3f13abc1 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat index 169c1f55b9e..5fe5d5f0791 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat index 4271cd901d9..19dfd1b9a4f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index af6734fd309..085f8d62037 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: c8851749012eba443a8ec7cd675bab92, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index ccc928d9cfc..c089759ec51 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: c8851749012eba443a8ec7cd675bab92, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index aa8d2dcbb2a..956e5c25658 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: 64a09234503ae404cb310166777fbd45, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index e7c6dc130eb..76e8f827d35 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: 64a09234503ae404cb310166777fbd45, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat index d2972e4fea3..179770163b4 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat @@ -72,17 +72,33 @@ Material: m_Texture: {fileID: 2800000, guid: 8de821bfcfb574452896ed13a1405a5c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -97,6 +113,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -119,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat index 79cb63a8fef..4be3b9166c6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 From 13d6fb274060fd32516b7bb24de22f57334379e8 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 18:40:43 +0300 Subject: [PATCH 03/12] Foundation Scenes/ .mat files upgrade. --- .../Scenes/001_SimpleCube/001_SimpleCube.mat | 17 ++++++++- .../002_Camera_Clip/002_CameraClip_Sphere.mat | 17 ++++++++- .../003_CameraOrtho_Sphere.mat | 17 ++++++++- .../004_CameraTargetTextureSphere.mat | 17 ++++++++- .../004_Camera_TargetTexture_Sphere.mat | 19 +++++++++- .../007_LitShaderMaps_01_BaseWhite.mat | 17 ++++++++- .../007_LitShaderMaps_02_BaseColor.mat | 19 +++++++++- .../007_LitShaderMaps_03_Specular.mat | 17 ++++++++- .../007_LitShaderMaps_04_Normal.mat | 17 ++++++++- .../007_LitShaderMaps_05_Emission.mat | 17 ++++++++- .../007_LitShaderMaps_06_All.mat | 17 ++++++++- .../007_LitShaderMaps_UnlitMatTexture_08.mat | 17 ++++++++- .../007_LitShaderMaps_UnlitMat_07.mat | 7 +++- .../PBRSphere.mat | 19 +++++++++- .../PBRSphere1.mat | 5 ++- .../PBRSphere10.mat | 5 ++- .../PBRSphere11.mat | 5 ++- .../PBRSphere12.mat | 5 ++- .../PBRSphere13.mat | 5 ++- .../PBRSphere14.mat | 5 ++- .../PBRSphere15.mat | 5 ++- .../PBRSphere16.mat | 5 ++- .../PBRSphere17.mat | 5 ++- .../PBRSphere18.mat | 5 ++- .../PBRSphere19.mat | 5 ++- .../PBRSphere2.mat | 5 ++- .../PBRSphere20.mat | 5 ++- .../PBRSphere21.mat | 5 ++- .../PBRSphere3.mat | 5 ++- .../PBRSphere4.mat | 5 ++- .../PBRSphere5.mat | 5 ++- .../PBRSphere6.mat | 5 ++- .../PBRSphere7.mat | 5 ++- .../PBRSphere8.mat | 5 ++- .../PBRSphere9.mat | 5 ++- .../Materials/blue.mat | 19 +++++++++- .../Materials/green.mat | 19 +++++++++- .../Materials/red.mat | 17 ++++++++- .../Materials/yellow.mat | 19 +++++++++- .../Scenes/014_CameraMulti_MiniMap/red.mat | 19 +++++++++- .../Scenes/015_CameraMulti_FPSCam/blue.mat | 19 +++++++++- .../Scenes/015_CameraMulti_FPSCam/red.mat | 17 ++++++++- .../PhysicallyBased_NoReceiveShadows.mat | 19 +++++++++- .../SimpleLighting_NoReceiveShadows.mat | 19 +++++++++- .../BenchDrill/materials/kabel.mat | 19 +++++++++- .../BenchDrill/materials/korpus.mat | 19 +++++++++- .../BenchDrill/materials/kozhuh.mat | 19 +++++++++- .../BenchDrill/materials/motor.mat | 19 +++++++++- .../BenchDrill/materials/spindle.mat | 19 +++++++++- .../BenchDrill/materials/stanina.mat | 19 +++++++++- .../BenchDrill/materials/stanina_vk.mat | 19 +++++++++- .../BenchDrill/materials/top.mat | 19 +++++++++- .../BenchDrill/materials/val.mat | 19 +++++++++- .../Materials/031_IndustrialGlass.mat | 8 +++- .../037_Particles/Materials/1.Lit-Cutout.mat | 5 ++- .../037_Particles/Materials/1.Lit-Fade.mat | 6 ++- .../Materials/1.Lit-Shadow-Cutout.mat | 5 ++- .../Materials/1.Lit-Shadow-Fade.mat | 6 ++- .../Materials/1.Lit-Shadow-Opaque.mat | 5 ++- .../Materials/1.Lit-Shadow-Transparent.mat | 8 +++- .../Materials/2.Unlit-Additive.mat | 3 +- .../Materials/2.Unlit-CameraFading-Fade.mat | 3 +- .../2.Unlit-CameraFading-Transparent.mat | 5 ++- .../Materials/2.Unlit-Modulate.mat | 3 +- .../Materials/2.Unlit-SoftParticles-Fade.mat | 3 +- .../2.Unlit-SoftParticles-Transparent.mat | 5 ++- .../Materials/2.Unlit-Subtractive.mat | 3 +- .../Materials/3.Lit-Additive.mat | 3 +- .../037_Particles/Materials/3.Lit-Color.mat | 3 +- .../Materials/3.Lit-Difference.mat | 3 +- .../Materials/3.Lit-Multiply.mat | 3 +- .../037_Particles/Materials/3.Lit-Overlay.mat | 3 +- .../Materials/3.Lit-Subtractive.mat | 3 +- .../037_Particles/Materials/4.Lit-Opaque.mat | 5 ++- .../Materials/5.Lit-TwoSided.mat | 7 +++- .../Materials/5.Unlit-TwoSided.mat | 4 +- .../Materials/6.Lit-FlipBookSimple-Fade.mat | 6 ++- .../6.Unlit-FlipBookBlended-Fade.mat | 3 +- .../Materials/7.Lit-Transparent.mat | 8 +++- .../Materials/8.Lit-Distortion.mat | 3 +- .../Scenes/037_Particles/Materials/Plane.mat | 19 +++++++++- .../CurrentMaterials/ArchesMaterial.mat | 19 +++++++++- .../CurrentMaterials/BloxMaterial.mat | 19 +++++++++- .../CurrentMaterials/ClockGlassMaterial.mat | 21 ++++++++++- .../CurrentMaterials/ClockMaterial.mat | 19 +++++++++- .../CurrentMaterials/DollhouseMaterial.mat | 19 +++++++++- .../CurrentMaterials/DrawersMaterial.mat | 19 +++++++++- .../CurrentMaterials/EyesMaterial.mat | 19 +++++++++- .../FlareParticleMaterial.mat | 7 ++-- .../FluffParticleMaterial.mat | 19 +++++++++- .../CurrentMaterials/GunMaterial.mat | 21 ++++++++++- .../CurrentMaterials/HearseMaterial.mat | 21 ++++++++++- .../CurrentMaterials/HellephantMaterial.mat | 19 +++++++++- .../CurrentMaterials/PlanksMaterial.mat | 19 +++++++++- .../CurrentMaterials/PlayerMaterial.mat | 21 ++++++++++- .../CurrentMaterials/RobotMaterial.mat | 21 ++++++++++- .../CurrentMaterials/SpinningTopMaterial.mat | 19 +++++++++- .../CurrentMaterials/StarMaterial.mat | 19 +++++++++- .../CurrentMaterials/TrainMaterial.mat | 21 ++++++++++- .../CurrentMaterials/WallMaterial.mat | 23 ++++++++++-- .../CurrentMaterials/ZombearMaterial.mat | 19 +++++++++- .../CurrentMaterials/ZombunnyMaterial.mat | 19 +++++++++- .../050_Shader_Graphs/Graphs/PBR_Cutout.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/PBR_Maps.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/PBR_Meta.mat | 31 +++++++++++++++- .../Graphs/PBR_Transparent.mat | 17 ++++++++- .../Graphs/ShaderGraphs_Unlit_Alpha.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/Unlit_Cutout.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/Unlit_Maps.mat | 17 ++++++++- .../Graph/PBR_Cutout_Override.mat | 6 ++- .../Graph/PBR_Maps_Override.mat | 19 +++++++++- .../Graph/PBR_Meta_Override.mat | 19 +++++++++- .../Graph/PBR_Transparent_Override.mat | 11 ++++-- .../Graph/Unlit_Alpha_Override.mat | 8 ++-- .../Graph/Unlit_Cutout_Override.mat | 8 ++-- .../Graph/Unlit_Maps_Override.mat | 16 +++++++- .../053_UnlitShader/UnlitShaderRedGI.mat | 5 ++- .../053_UnlitShader/UnlitShaderRedNoGI.mat | 5 ++- .../053_UnlitShader/UnlitShaderWhiteGI.mat | 5 ++- .../109_CameraTargetTexture.mat | 7 +++- .../110_CameraTargetTexture.mat | 7 +++- .../Scenes/111_CameraStackMSAA/Blue.mat | 19 +++++++++- .../Assets/Scenes/111_CameraStackMSAA/Red.mat | 19 +++++++++- .../Scenes/111_CameraStackMSAA/White.mat | 17 ++++++++- .../Assets/Scenes/112_FogBasic/Lit.mat | 7 +++- .../Scenes/112_FogBasic/LitShaderGraph.mat | 4 +- .../Scenes/112_FogBasic/ParticleLit.mat | 7 +++- .../Scenes/112_FogBasic/ParticleUnlit.mat | 4 +- .../Assets/Scenes/112_FogBasic/SimpleLit.mat | 7 +++- .../SpeedTreeBillboard_disabled.mat | 6 ++- .../112_FogBasic/TerrainLit_disabled.mat | 7 +++- .../Assets/Scenes/112_FogBasic/Unlit.mat | 7 +++- .../Scenes/112_FogBasic/UnlitShaderGraph.mat | 4 +- .../BottomLeftTexture.mat | 7 +++- .../BottomRightTexture.mat | 7 +++- .../TopLeftTexture.mat | 7 +++- .../TopRightTexture.mat | 7 +++- .../ShaderGraphs_SphereIntersector.mat | 15 ++++++++ .../Assets/Scenes/126_SampleDepth/unlit.mat | 5 ++- .../Scenes/127_ClearRenderTexture/Unlit.mat | 7 +++- .../Assets/Scenes/128_TBN/LitTBN.mat | 37 ++++++++++++++++++- .../131_ParallaxMapping/LitParallax.mat | 32 +++++++++++++++- .../ParallaxMappingNode.mat | 27 ++++++++++++++ .../Scenes/132_DetailMapping/Detail.mat | 17 ++++++++- .../132_DetailMapping/Detail_BaseOnly.mat | 5 ++- .../Detail_BaseOnly_Scaled.mat | 17 ++++++++- .../132_DetailMapping/Detail_MainNormal.mat | 17 ++++++++- .../Scenes/132_DetailMapping/Detail_Mask.mat | 17 ++++++++- .../132_DetailMapping/Detail_NormalOnly.mat | 17 ++++++++- .../Detail_NormalOnly_Scaled8x.mat | 5 ++- .../132_DetailMapping/Detail_Tiling5x.mat | 17 ++++++++- .../LightCookie_BakedLit.mat | 4 +- .../LightCookie_Lit.mat | 5 ++- .../LightCookie_Particles_Lit.mat | 5 ++- .../LightCookie_Particles_SimpleLit.mat | 2 +- .../LightCookie_Particles_Unlit.mat | 2 +- .../LightCookie_SG_Lit.mat | 2 +- .../LightCookie_SG_Unlit.mat | 2 +- .../LightCookie_SimpleLit.mat | 5 ++- .../LightCookie_Unlit.mat | 4 +- .../Scenes/200_Assets/Materials/Floor.mat | 5 ++- .../Materials/SSAO_MAT_LitClean.mat | 5 ++- .../Materials/SSAO_MAT_LitNormal.mat | 5 ++- .../SSAO_MAT_LitNormalAlphaClipped.mat | 5 ++- .../SSAO_MAT_LitNormalDetailParallax.mat | 5 ++- .../SSAO_MAT_LitParticlesAlphaClipped.mat | 5 ++- .../Materials/SSAO_MAT_LitParticlesClean.mat | 5 ++- .../Materials/SSAO_MAT_LitParticlesNormal.mat | 5 ++- .../Materials/SSAO_MAT_ParticlesSimpleLit.mat | 2 +- ...SAO_MAT_ParticlesSimpleLitAlphaClipped.mat | 2 +- .../SSAO_MAT_ParticlesSimpleLitNormal.mat | 2 +- .../Materials/SSAO_MAT_SG_NormalBlend.mat | 17 ++++++++- .../Materials/SSAO_MAT_SG_NormalStrength.mat | 15 ++++++++ .../Materials/SSAO_MAT_SG_NormalTriplanar.mat | 15 ++++++++ .../SSAO_MAT_SimpleLitAlphaClippedNormal.mat | 5 ++- .../Materials/SSAO_MAT_SimpleLitClean.mat | 5 ++- .../Materials/SSAO_MAT_SimpleLitNormal.mat | 5 ++- .../200_Assets/Materials/SSAO_MAT_Unlit.mat | 4 +- .../SSAO_MAT_UnlitParticlesAlphaClipped.mat | 2 +- .../SSAO_MAT_UnlitParticlesClean.mat | 2 +- .../SSAO_MAT_UnlitParticlesNormal.mat | 2 +- .../Scenes/206_Motion_Vectors/SGMaterial.mat | 6 ++- .../Scenes/230_Decals/Materials/Brick.mat | 2 +- .../Scenes/230_Decals/Materials/LitRed.mat | 3 +- .../Scenes/230_Decals/Materials/UnlitRed.mat | 3 +- 185 files changed, 1770 insertions(+), 234 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat index 7338ea3697a..68b16777498 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 0.186 - _Glossiness: 1 - _GlossinessSource: 0 @@ -109,6 +123,7 @@ Material: - _SpecularHighlights: 0 - _SpecularStrength: 200 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat index adbe42898da..a223664594d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat index fa27b17c6d8..81a81df0fc6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat index bdbe4cab89f..1bf1ff0f845 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -130,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat index 8d0d3d08116..d0a42045f60 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,12 +122,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index 8d07f5136d3..c20dccfb950 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -56,15 +56,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -79,6 +93,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -100,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index b7e5d08ff74..e667c58d70f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _SPECULAR_COLOR m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -68,15 +68,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 15d891e2937..45b3ce25f5e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 2800000, guid: 1a88ce5df35bb4c98aa9da12443ff932, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 6654537bba0..8bc3fc3cc18 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -68,15 +68,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index 8017cb211b4..079e8d7f6ba 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat index d5cd23fa0e5..b5a8bf68fdd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -68,15 +68,29 @@ Material: m_Texture: {fileID: 2800000, guid: 226a58968de1b4cf4a59aa1f39c891c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 3877d96ce04..ff28352ba78 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 2800000, guid: 226a58968de1b4cf4a59aa1f39c891c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -106,6 +120,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index bb0600b87ed..7d7dc4b2ae7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -106,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.5897915, b: 1, a: 1} - - _Color: {r: 0, g: 0.58979154, b: 1, a: 1} + - _Color: {r: 0, g: 0.5897915, b: 1, a: 1} - _EmissionColor: {r: 0.20663926, g: 0.24034719, b: 0.28676468, a: 1} - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index 6a8407c7252..5e9e0f072cd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -129,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat index 10869c85c20..1dd11094d5b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat index e2d74e2ddbb..eeffd505340 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat index 636d8035892..7a43c3f8ba9 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat index d8517bd9fac..31b776acc6f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat index 76f493dd0ae..b5dfd89d3da 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat index fce0c676e83..ee7463553ee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.3 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat index 595c6c3c1b3..4bc4dc71ba0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.4 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat index 14655ca529c..98a2866541f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat index 9977b33c556..75b277ee589 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.6 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat index 404374a0b01..9e8412ecaef 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat index d794b7ec8b6..e59c9a28342 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.8 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat index 25f5e38ce77..acbd63ab3c5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat index 91169e234a7..4d6b8960e71 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.9 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat index 6aca1ea9536..62115e3db8a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat index 866d1c1235d..8ede0d7e136 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.3 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat index 97d7de4ba2c..70399636151 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.4 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat index 85fbbd31288..5d124bb878a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat index 610b9bb7d75..3356b2c0f5b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.6 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat index 8a5c965b89e..c3abcf0a3a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat index 8b54a80e164..c1a6888dfcd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.8 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat index 7f62696daf5..77f4e5b5c63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.9 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat index 194a5da7115..1a34e793b0c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.089654885, b: 1, a: 1} - - _Color: {r: 0, g: 0.08965492, b: 1, a: 1} + - _Color: {r: 0, g: 0.089654855, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat index aeb2cb0fb45..4b96e8e5184 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 1, b: 0.17241374, a: 1} - - _Color: {r: 0, g: 1, b: 0.17241383, a: 1} + - _Color: {r: 0, g: 1, b: 0.1724137, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat index f2754c1342d..2bbbf78f098 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat @@ -60,15 +60,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,6 +99,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat index d1e1b3ebeb6..08c26c02098 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat @@ -60,15 +60,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,12 +99,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.9724137, b: 0, a: 1} - - _Color: {r: 1, g: 0.9724138, b: 0, a: 1} + - _Color: {r: 1, g: 0.9724137, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat index e3d1203d391..e0dca117fed 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0, b: 0, a: 0.5} - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat index 1842a459b41..dbb47a1acfe 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat @@ -60,15 +60,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,12 +99,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.13103479, b: 1, a: 1} - - _Color: {r: 0, g: 0.13103485, b: 1, a: 1} + - _Color: {r: 0, g: 0.13103476, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat index 5ec6c0d43a7..b41956a39df 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,6 +112,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat index bbc0d2ae90b..ddb13edc714 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat index 99d0f9952e6..a5802cf2c48 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat index df203555925..2478a965e66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat index de9bf30728b..ef90378d2b6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat index 1096a7d0da0..232b6c61892 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat index d0c1e489f02..8d960549da7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat index 9240ec7263e..a3c0c732d29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat index c87ed16e5e6..244ae0f447b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat index 16ecdd4146a..03441227ea2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat index 55bee70824d..d8b5f2b4673 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat index b64f22e3e1f..5e3a5519a62 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat index ed784d0df62..df150b7146a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,11 +27,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -107,6 +108,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -116,6 +118,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -134,6 +137,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat index bfa2e76b142..bc61018c449 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat index 823f2c7ab79..1a8381ac879 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 0.6 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat index 0515af4af4d..fb5f4486c3d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -78,6 +78,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -92,6 +93,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -113,6 +115,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat index 9decb3dd6e0..35e3b909c84 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 0.6 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat index d0e55240091..93a8804344f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat index 02ebcf2184c..553aac06859 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -78,7 +79,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat index c51d6667841..cbcaba36027 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat index 7851a2e55aa..289124fe605 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat index 34d8b1fdb3e..3fa1834d178 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 2.Unlit-CameraFading-Transparent m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FADING_ON _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _EMISSION _FADING_ON _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat index b0a5f908d18..e902c742827 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat index a505edb6623..a3e42ee3d76 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat index a0f0b2808ba..36ab5bfb11c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 2.Unlit-SoftParticles-Transparent m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FADING_ON _SOFTPARTICLES_ON _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _EMISSION _FADING_ON _SOFTPARTICLES_ON _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat index f6f7309f478..2368c3d084d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat index 2d297ef8e76..ca85c807233 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat index 0906ec58fe5..d1046dd428c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat index 59fe0cdb9ab..ff704f833bf 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat index a5eb5b5678a..9f201ccf472 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat index 2aa04b87115..3b21a68f69c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat index 35d463d4e4a..93b35467d68 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat index 8d22e54bd2c..0627c65bc89 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -124,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat index 529e654598c..e019012c5a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque @@ -78,6 +78,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -92,6 +93,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat index 1291a86a56f..a1734b00090 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque @@ -122,4 +122,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat index 4471128385b..bba6adb0a22 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -66,6 +67,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -80,6 +82,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 1 - _FlipbookMode: 1 @@ -101,6 +104,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -124,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat index 5e536354211..0216b1cb6e7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat index d44d4320f7a..e1e61199ae8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -65,7 +66,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -80,6 +82,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -101,6 +104,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -124,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat index 6583127795f..ae6f6d0cdae 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat index edaad3295a0..1411885e08c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -96,6 +112,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -118,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat index 137edc115c6..032d57a5964 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat index 86396779955..fd2e23f2536 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat index dbd981b4644..1803bd78c7b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,18 +89,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 1 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -118,13 +134,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.4573962, g: 0.56541884, b: 0.6911764, a: 0.21176471} - - _Color: {r: 0.4573962, g: 0.56541884, b: 0.6911765, a: 0.21176471} + - _Color: {r: 0.4573962, g: 0.56541884, b: 0.69117635, a: 0.21176471} - _Emission: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0.99999994} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat index 0c42219206a..84061467c3a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: a9b9ddf6fe2c8a34d94a0f40cc7288c0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat index bc85e8b8d51..a37f1e63a14 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: bd717824af089434aada5d941efbbe36, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat index 838c147d206..1c9adca9f30 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 3e81aed82f687094da25b33759ee1c30, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat index 78ab6ab45e3..e39e8beb428 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 0.6 @@ -102,6 +118,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -128,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat index b194ed85885..b957aff2595 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat @@ -9,16 +9,17 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FlareParticleMaterial m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -90,4 +91,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat index e4cb7df82c4..657506ea307 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -108,6 +124,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat index a408b91e818..3ac8fdfe9a6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GunMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 0bfd74eda21b8b4408f654c7cf1f3665, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat index c8d486b68e8..251369af6b0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HearseMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 72d2e042768206b46bb11e99674a6a2d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat index 0daa163e687..30a7f8d09c7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,18 +97,34 @@ Material: m_Texture: {fileID: 2800000, guid: 2c38b41a69c9bdc4bbac4dbc9324dacf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.4 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -127,6 +143,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat index 0d4f6a0b255..60ddfb2b9ee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 41a4fe639750e1f46a3f96eef43eac7e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 0.85 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat index 155fcf3be7c..339897ba356 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PlayerMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: bc9b1c6383841ea4f9e532a49c651ff6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat index c60235d7052..9b7385719fd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: RobotMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 8136f0437c3f1304c90ab510cf2accd8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat index 6ec8a5558e2..eae50f61b64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat index e89e8c9fcfa..e8fc767a29c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,18 +89,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _DynamicEmissionLM: 0 - _EmissionLM: 0 - _EmissionScaleUI: 15 @@ -120,6 +136,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat index c73ea5071d9..35e9bd377c2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: TrainMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat index 3e0e60086c4..de19b8aa496 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WallMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 3d9e68517e401ae449049a6e5ec82ff1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,13 +117,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.60365707, g: 0.5881271, b: 0.7205882, a: 1} - - _Color: {r: 0.60365707, g: 0.58812714, b: 0.7205882, a: 1} + - _Color: {r: 0.60365707, g: 0.5881271, b: 0.7205882, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0.99999994} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat index 6b291f88b1e..f90a3378ea9 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 082a477a29c51434097a2cba0ae07c87, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.4 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -115,6 +131,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat index bdc40c77711..eca3353d77c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 4f60b9a58009248478b8cac95541f9d1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.6 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -102,6 +118,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -128,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat index 54f9f7ade4e..098fd79667a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7730018706621262414 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -48,6 +61,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat index 4139ab0e292..54cac319e62 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6367256528357113983 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -68,6 +81,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat index 28256f5a7c2..5a765f5bc9c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat @@ -31,5 +31,34 @@ Material: m_Texture: {fileID: 2800000, guid: 381a7f93836b44c50b05d24f323b02cc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Floats: [] + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &599612425908954852 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat index f07624c4d47..e5d5b1f6877 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8714576472390649980 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -80,6 +93,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat index 668544eaaba..bc4ab957264 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1739935094799035826 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -33,6 +46,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat index ce1159702a9..82e736e6517 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat @@ -48,6 +48,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &7996778305891107488 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat index e2efd535f7d..b7f9962d6fe 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1957053532852904669 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -76,7 +89,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Vector3_A9D9C453: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat index dd051623d02..f7bedbb273f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -52,9 +52,11 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _CastShadows: 1 - _Cull: 0 - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SrcBlend: 1 @@ -77,4 +79,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat index b106ef94b61..37c3e995a6b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -82,6 +83,20 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat index f7286b9c55a..68ac0198f83 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -58,6 +59,20 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat index 3df356149d0..78face071fa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,10 +26,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,10 +97,12 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SrcBlend: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat index 7ce0c72647c..e564836e1db 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat @@ -14,10 +14,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -40,6 +41,7 @@ Material: - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _SrcBlend: 5 - _Surface: 1 @@ -60,4 +62,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat index 9631fd64542..cc0c9d98e93 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat @@ -13,10 +13,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -55,6 +56,7 @@ Material: - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _SrcBlend: 5 - _Surface: 1 @@ -75,4 +77,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat index f01a288eebc..52fe0317bcb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -90,7 +91,18 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - Vector3_A9D9C453: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat index 147ae640b5e..126a3d21e82 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -98,6 +100,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat index 46fa23cb796..d8f680b4307 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,11 +93,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -110,6 +112,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat index ebcfcf6060b..a8efd1bdc97 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -93,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -106,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -128,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat index 1578894270b..1947b2d3ad7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -109,12 +111,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} @@ -131,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat index 7651251702e..9caefe5ed64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -109,12 +111,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} @@ -131,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat index ccc5f03b066..a34019cdc54 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,12 +122,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat index c48d70558ed..6c25e51f547 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -107,12 +121,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat index 375c39651f4..bfc70d65588 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -107,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat index d6688f9be97..6965f471dcb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,12 +103,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat index bca0b115e81..6699e24b26d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat @@ -76,6 +76,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -106,6 +107,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -141,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat index 9c40dd57e8c..0d9e2640e29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -97,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -116,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -123,7 +126,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -140,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat index 4d814071e85..1b4b4a2e626 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat @@ -128,7 +128,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -145,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat index 635f458a714..01d135fc451 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -105,12 +107,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat index 7b55af1ade0..679a923d2d8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat @@ -172,6 +172,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -212,6 +213,7 @@ Material: - _SpecularHighlights: 1 - _SquashAmount: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -230,7 +232,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} @@ -254,4 +256,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat index 9aac5c4c99b..383b5bd7ec2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat @@ -136,6 +136,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -144,6 +145,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -174,12 +176,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -195,4 +198,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat index ee5f63b0eb8..a6555dfc9f0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,12 +104,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat index bd63949abbb..558d9bf4254 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat @@ -76,6 +76,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -106,6 +107,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -143,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat index 68590b67420..f79101cfb66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat index 567960f6215..41110bef929 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat index 083a02b501f..506d9f25c08 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat index 68107454ca0..1a6f93b7202 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat index 081d767e325..0b9fca28879 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7047879695928620681 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -46,6 +59,8 @@ Material: m_Floats: - Vector1_77D99915: 0.493 - Vector1_D93EC8F8: 0.495 + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_456FBD92: {r: 1, g: 0, b: 0, a: 0.5254902} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat index e82e6394a21..d07001e14cf 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,6 +71,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat index 9c48a7abefa..75646c0a4d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,12 +84,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat index 38e03e7fa2f..c7169cfe71d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat index 0f3d21aaa1b..9913f56bf20 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!114 &-2905550057155615101 MonoBehaviour: m_ObjectHideFlags: 11 @@ -97,10 +97,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DistortionVectorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -185,6 +197,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - Vector1_5d53f5f6cf064c3da7cb09a66acbdcea: 0.08 @@ -205,9 +229,11 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatCoverage: 1 - _CoatIOR: 0.5 - _CoatMask: 0 @@ -216,7 +242,9 @@ Material: - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 + - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 @@ -242,6 +270,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -307,6 +336,7 @@ Material: - _SpecularHighlights: 1 - _SpecularOcclusionMode: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 8 - _StencilRefDistortionVec: 4 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat index ca05f8f2e8b..7ac07aeec63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat @@ -159,6 +159,19 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_5d53f5f6cf064c3da7cb09a66acbdcea: 8 - _AORemapMax: 1 @@ -260,6 +273,7 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.08 - _PreRefractionPass: 0 + - _QueueControl: 0 - _QueueOffset: 0 - _RayTracing: 0 - _ReceiveShadows: 1 @@ -340,6 +354,19 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &847778799177982581 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!114 &3764524467883863570 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat index e923d4cc043..0af6d65f857 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat index 8f5012d79e1..b27e7391301 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +108,7 @@ Material: - _DetailMode: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -120,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat index 07f53656153..4654523a66a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat index 22e48666b97..b8b86e600f1 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat index 86ba1fb9bcb..3f0bccd9339 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat index 9cf7f29cab1..1a6f45f5e64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat index 87531a9af39..8371eaa9f70 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 8 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -120,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat index e2cf68371f7..5cbc817a424 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat index 06d8e887f60..5da9a4db2ae 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat @@ -163,6 +163,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -192,6 +193,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -229,4 +231,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat index 11c21a589af..3abf7d1d61f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat index b7c9b8b33e3..a01d23c37c2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -97,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -116,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -140,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat index 7899915d8c2..8afb0b6cf0a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat @@ -141,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat index d7b8c26de91..9306044bd53 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat @@ -140,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat index 0d0939f7402..633a919c38f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat @@ -123,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat index ee4b96182b9..3e37064b031 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat @@ -123,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat index d65eb7fda07..7ccf2a6c83b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -105,6 +107,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat index cccc1c063fb..77916a8db66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat index f841c79dc0f..e001e91c2a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat index 171d37de124..f5e94d99cf6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat index cbf1b5c442b..dd783b4d6b5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 2 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat index 1f9b4f62e3c..f45bec70140 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat index 48212d5a89c..b5c153fc6e0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 0 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat index 3454b4a1cdd..e51c52cc471 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat index 4f6f93bf503..fde5c32da34 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat index ddbbe2307dd..8a10d6b3b9e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat index 5f1b0d5b2ed..9bbb44ad133 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat index c2482f38809..a689eb5395b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat index fcee2770412..28acded3485 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat index 7d4442a669c..6f8e1147901 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat @@ -49,6 +49,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 1 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &4561937020678631499 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat index 9bc2ffae4a5..91b0d09392b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-37601213753009020 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -43,5 +56,7 @@ Material: m_Ints: [] m_Floats: - Vector1_C89186F: 1 + - _QueueControl: 1 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat index 86718c421b7..5ee2a7a4d92 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat @@ -39,7 +39,22 @@ Material: m_Ints: [] m_Floats: - _Blend: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _Tile: 1 m_Colors: - _Tiling: {r: 2.62, g: 1.37, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &7230609976969288182 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat index a4e6adf5941..272fc0ebcac 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat index 6dff646be8f..551a1174c47 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat index c2590d91b78..2752e8c0274 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat index fbf2f21018d..699ed4554db 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat @@ -116,6 +116,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -142,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -173,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat index 3c05c626080..9c4a9cf34d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat index b9f2714570b..7ca05eea828 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat index a831387827c..eb9dd89c0d2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat index 6daaa2021ab..b4938749368 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -46,6 +46,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat index 02249ca0b3c..e3918ceb9fb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat @@ -122,4 +122,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat index 98fddc3951f..5c568f7a1af 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat @@ -95,6 +95,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 0.387 - _Parallax: 0.0477 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.742 @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat index a32aeccfda4..38bc4fafe7c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat @@ -95,6 +95,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 0.387 - _Parallax: 0.0477 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.742 @@ -124,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 From 4e8e67eb4fc2e22061ebbef5556083a4e20bb0f3 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 18:42:26 +0300 Subject: [PATCH 04/12] Foundation Scenes/ .renderTexture files upgrade. --- .../Cam_TargetTex.renderTexture | 18 ++++++++++++++---- ...adersAlphaOutputRenderTexture.renderTexture | 6 ++++-- ...ersAlphaOutputRendererFeature.renderTexture | 5 +++-- .../MapRenderTexture.renderTexture | 5 +++-- .../BottomLeftRT.renderTexture | 6 ++++-- .../BottomRightRT.renderTexture | 6 ++++-- .../TopLeftRT.renderTexture | 6 ++++-- .../TopRightRT.renderTexture | 6 ++++-- .../127_ClearRenderTexture/RTT.renderTexture | 6 ++++-- 9 files changed, 44 insertions(+), 20 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture index e517328aaad..f3fdb1e34d3 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture @@ -3,20 +3,29 @@ --- !u!84 &8400000 RenderTexture: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Cam_TargetTex m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 512 m_Height: 256 m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 + m_MipCount: -1 + m_DepthStencilFormat: 92 + m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -27,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture index fec455cf2fa..274de5fa9cb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 1280 m_Height: 720 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture index d7fd49b2f64..12255e6ec9a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 1280 m_Height: 720 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture index b6e96ce48b8..e78b3acb92b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 32 m_Height: 64 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture index cae775574c7..f1e9300967a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture index d78591a562b..595888ab196 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture index 374f0930a1b..62acd39f9d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture index 34e0f5acd13..2032566d1a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture index 44fcebf30a0..bac9a97d9cb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 1024 m_Height: 1024 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 From ab9372043df45cff3976e2b27fd15bdf32a6aa98 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:07:03 +0300 Subject: [PATCH 05/12] Lighting CommonAssets/ .mat upgrade. --- .../CommonAssets/Materials/CeramicTiles.mat | 19 ++++++++++++++++++- .../CommonAssets/Materials/CornellBox.mat | 5 ++++- .../Materials/CornellBox_green.mat | 17 ++++++++++++++++- .../CommonAssets/Materials/CornellBox_red.mat | 17 ++++++++++++++++- .../CommonAssets/Materials/Fully_Metalic.mat | 5 ++++- .../CommonAssets/Materials/LW_Diffuse.mat | 5 ++++- .../CommonAssets/Materials/LW_Material.mat | 19 ++++++++++++++++++- .../Assets/CommonAssets/Materials/Matte.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/kabel.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/korpus.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/kozhuh.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/motor.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/spindle.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/stanina.mat | 19 ++++++++++++++++++- .../BenchDrill/materials/stanina_vk.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/top.mat | 19 ++++++++++++++++++- .../Meshes/BenchDrill/materials/val.mat | 19 ++++++++++++++++++- 17 files changed, 260 insertions(+), 17 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat index a8480b79015..ba50091c0d3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat index 1882372c75d..731d4a581ae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,11 +97,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -120,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat index b29c8b34e94..7f4dcf1832d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat @@ -68,15 +68,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat index 4853141bb0f..72308f8800c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat index 65b2b085ed2..b6dd5c0a627 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat index 992e51dc8a5..7eea823dd5f 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -104,6 +106,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat index 371e2b1a2de..14b20a2b4aa 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat index 2c0a9bc0ae9..c0b9765ac61 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -93,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -115,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat index df203555925..2478a965e66 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat index de9bf30728b..ef90378d2b6 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat index 1096a7d0da0..232b6c61892 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat index d0c1e489f02..8d960549da7 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat index 9240ec7263e..a3c0c732d29 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat index c87ed16e5e6..244ae0f447b 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat index 16ecdd4146a..03441227ea2 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat index 55bee70824d..d8b5f2b4673 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat index b64f22e3e1f..5e3a5519a62 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 From 3f275a61d1476483ed990d7e7979c6c362789b37 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:19:44 +0300 Subject: [PATCH 06/12] Lighting EditMode Assets .mat files upgrade. --- .../contents/blue_emissive.mat | 5 ++++- .../contents/green_emissive.mat | 5 ++++- .../Lighting_ReflectionProbeBaking/contents/grey.mat | 5 ++++- .../Lighting_ReflectionProbeBaking/contents/red_emissive.mat | 5 ++++- .../Lighting_ReflectionProbeBaking/contents/sphere.mat | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat index e9ce9a046cb..96d2ec06eef 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat index 4c4eb4bc930..6a2d10a3ac3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat index 5ee97b410f9..317c55948f6 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat index 1be7aea0a9b..bf0021805a3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat index f95f12d9d64..153ed6dc2ae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 From 856d13a26ff78dbd61e9fe3d86fd9104b0143d19 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:23:04 +0300 Subject: [PATCH 07/12] Lighting Scenes/ .mat files upgrade. --- .../005_LitBakeEmission_Sphere.mat | 17 ++++++++- .../006_LitShaderLightProbes_Sphere.mat | 17 ++++++++- .../CutoutBaked.mat | 37 ++++++++++++++++++- .../Materials/034_Hole_mesh.mat | 5 ++- .../Materials/034_Hole_mesh_highlights.mat | 5 ++- .../Materials/034_IndustrialGlass.mat | 7 +++- .../034_IndustrialGlass_highlights.mat | 7 +++- .../Materials/034_Roofing.mat | 5 ++- .../Materials/034_Roofing_highlights.mat | 5 ++- .../Materials/034_basic.mat | 19 +++++++++- .../Materials/034_basic_highlights.mat | 19 +++++++++- .../Materials/034_rocks_dirt_ground.mat | 19 +++++++++- .../034_rocks_dirt_ground_highlights.mat | 19 +++++++++- .../Dots.mat | 19 +++++++++- .../044_ReflectionProbe.mat | 19 +++++++++- .../044_ReflectionProbeRough.mat | 19 +++++++++- .../044_ReflectionProbeTextured.mat | 19 +++++++++- .../044_ReflectionProbeTextured_rough.mat | 10 +++-- .../ReflectiveMaterial.mat | 37 ++++++++++++++++++- .../UnlitCustomShadows.mat | 3 +- .../Materials/ParticleLit.mat | 2 +- .../Materials/SimpleLit.mat | 7 +++- .../Materials/Unlit.mat | 7 +++- .../150_LitRealtimeEmission_Sphere.mat | 2 +- .../Enlighten_Shader_Graph.mat | 17 ++++++++- .../151_Lighting_EnlightenLights/White.mat | 2 +- .../153_Lighting_EnlightenTerrain/bark.mat | 7 +++- .../NonMetalicMaterial.mat | 7 +++- .../Scenes/200_Assets/Materials/Floor.mat | 5 ++- .../Materials/SSAO_MAT_BakedLit.mat | 4 +- .../SSAO_MAT_BakedLitAlphaClippedNormal.mat | 4 +- .../Materials/SSAO_MAT_BakedLitNormal.mat | 4 +- 32 files changed, 335 insertions(+), 40 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat index 4575423dd3a..825fe11f063 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 0cc039dffac..9d08c04932f 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index a047104c9c4..11c34e7c52a 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 0 - _Cutoff: 0.402 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat index a9aa42033c9..7b9587c8dae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0.75 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat index 5a3d9172aab..dac8c8f846d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0.75 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -141,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat index 3b9982dbda3..14e4cccd264 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat @@ -94,7 +94,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -104,6 +105,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -122,6 +124,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -144,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat index 4f3fd39491c..2b9cb92d7e7 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,7 +106,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -116,6 +117,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -134,6 +136,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat index e92c5028f02..34c3be22c65 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat @@ -95,6 +95,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -104,6 +105,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -122,6 +124,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -144,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat index 2b9db9255ec..65f606a9813 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat @@ -94,6 +94,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -103,6 +104,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -121,6 +123,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat index 037d3295bc9..6115b4985f1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat index 91194daf528..6e9957d3962 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat index 5d35afaee69..dbe8a5971e0 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat index 54780cf3274..20628bb64ec 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat index 4a3d8358e92..e2fc5923c10 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat index bcdffe62837..f368327cb09 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -106,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat index d9ca438ce86..8abb6736795 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat @@ -68,17 +68,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -93,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -115,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat index 31c196bbfec..c88e3ab2f4d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -106,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat index 6d98242b28b..1b6536a859d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -97,7 +98,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -121,6 +124,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat index 994ea70221e..0b89481f83d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat index f5172617e73..79525dbaa3c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat @@ -97,6 +97,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -124,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat index ec65735f380..fa2e2c4ba92 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat @@ -207,4 +207,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat index e0c7427e703..ea8ae700dee 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -118,12 +120,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat index 6d24afeec44..260ea30df57 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,12 +117,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat index 0299f2d3c68..8ee58f0b522 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat index 626c59ad6f9..c07a510f7a1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat @@ -33,6 +33,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &6711638571528999795 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat index 600ed37aae0..b42df3884ed 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat index d85904c57a6..31e259768db 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,12 +103,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9339623, g: 0.489574, b: 0.110137045, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.9339623, g: 0.4895739, b: 0.11013702, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat index cb5954656b9..8a571c2380c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,12 +116,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7075471, g: 0.7075471, b: 0.7075471, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat index f841c79dc0f..e001e91c2a8 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat index 59bcaf93d5b..515c280efe1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat index bcb473769d6..3c049e8f721 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat index 908f6c14bdf..334208e4925 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 From 54aca2312fd90ff8bee48840af76314990387cbe Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:23:49 +0300 Subject: [PATCH 08/12] Lighting Scenes/ .renderTexture files upgrade. --- .../151_ForwardDeferred_RenderTexture.renderTexture | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture index 79b51c66cd7..d761cd4c9d3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 640 m_Height: 320 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 From d5b0aa301f3d9b6d600e7347beaf89591b846c24 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:34:33 +0300 Subject: [PATCH 09/12] Terrain CommonAssets/ .mat files upgrade. --- .../Assets/CommonAssets/Materials/Emissive1.mat | 5 ++++- .../Broadleaf_Desktop_OptionsOff Materials/Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat | 2 +- .../Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../LOD3/Broadleaf_Desktop_Field_Billboard.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../LOD3/Broadleaf_Desktop_Field_Billboard.mat | 2 +- 47 files changed, 50 insertions(+), 47 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat index 671dba5270e..a9e15c89438 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -93,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -106,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -127,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat index 7f4baf7a9e1..7da2dbc9094 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat index 211c817fe72..7fa576d8bfa 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat index 1cda6db2ffe..baea98465ad 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat index add34d12b78..03ad36fdcc1 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat index 0b02be9d2bc..c2c7306ab1c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat index 1b07d2f7fd0..2c5bfdec6b2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat index 463a493b0ff..1f85b1dc1be 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat index 051d4d60ba0..e6b13099036 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat index a5aa5db65ac..12396c9a33f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat index 8da3b5e844f..ca8200597fe 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat index ae1b64d777b..1e6d20692f8 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat index 13e5cef96d8..db499876771 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat index 88627fc1a0c..746c0299e56 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat index 189fcb92605..b6656af6c03 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat index 144e79a94f0..c1112d74431 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat index a9e576a743a..ba3378789cf 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat index 5a7c3dada6f..e2886ae8901 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat index c5f31841961..de315bc19b9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat index 9277c95680e..61bd66e4394 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat index 66b18f0d45f..d6eb11601bc 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat index 289833e4139..e655d75edfb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat index f536b3042e6..f2d29f7764b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat index 2fcb79dcf09..2120eaf7a13 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat index bec1d8663dc..0eadc2651e4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat index 8fb496c79ea..b85a0b3c370 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat index e275f57b394..f2df624525f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat index 6a9b0007eb9..544c6b1753e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat index e54b517f039..08bc98f2e6d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat index ce2792a63bf..bfef6ef07c4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat index 8826b439933..8792b2f035c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat index ab20da1d80d..9eddf1187e0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat index dcb555a1741..17fa0bbea1d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat index e3653a6a03a..fd22138943d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat index 22ea78d6852..856b4f167a2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat index 5bde6ca5846..9199d71b19a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat index 2ff2d8340c9..1d534c70f90 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat index a39d1f9fc3c..8ec058a457b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat index 70976edc6b0..ea4eb4345d9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 51fe3286061..241641a73b5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat index f1e6acc5e6c..00d22bb35db 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat index 5fe046d6870..4148e4bad30 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat index dfd83d55279..99aede0ac14 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat index 321c6b8174b..0b0ac63170e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat index 406fff485a2..6a9f7a22b02 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat index 2ff3fdc4784..a70fbdc3956 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 8a6e34a16d2..1be83ace735 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 From 1a09bd0039ea7178c6235bb08d598620b5fda1d5 Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:35:33 +0300 Subject: [PATCH 10/12] Terrain Scenes/ .mat files upgrade. --- .../Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat | 2 +- .../Broadleaf_Mobile Materials/LOD0/Branches_0.mat | 2 +- .../Broadleaf_Mobile Materials/LOD0/Leaves_1.mat | 2 +- .../Broadleaf_Mobile Materials/LOD1/Branches_0.mat | 2 +- .../Broadleaf_Mobile Materials/LOD1/Leaves_1.mat | 2 +- .../Broadleaf_Mobile Materials/LOD2/Branches_0.mat | 2 +- .../Broadleaf_Mobile Materials/LOD2/Leaves_1.mat | 2 +- .../Assets/Scenes/035_Shader_TerrainShaders/Rock.mat | 5 ++++- .../Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat | 2 +- .../__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat | 5 ++++- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat index b57423de8ba..27f05a0f4af 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat index 088a43d7309..f153364a444 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat index 0adafdb4167..f4e886156e3 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat index 823d2f48d32..b3235d551cc 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat index eaa1bc0beef..ce70e615395 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat index cd0489c5c7a..ab9bbc1cf27 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat index eb2804adab1..8b9cc2b9262 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat index 1e370122146..3a40d17e657 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -106,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat index 9d863dbf1ee..b7686607c9f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat index fcb4024e868..eae647d45f7 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -106,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -119,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 From 589e7a7e77345b1946094671cf06dc84ea50c56c Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:44:03 +0300 Subject: [PATCH 11/12] PostProcessing CommonAssets/ .mat files upgrade. --- .../CommonAssets/Materials/Array Element.mat | 17 ++++++++++++++++- .../CommonAssets/Materials/BW Gradient.mat | 7 +++++-- .../CommonAssets/Materials/Hole_mesh.mat | 7 +++++-- .../Materials/Hole_mesh_cutout.mat | 7 +++++-- .../Assets/CommonAssets/Materials/Lit.mat | 5 ++++- .../Materials/Pyramids Wall - v01.mat | 19 ++++++++++++++++++- .../Materials/SyntheticColorChart.mat | 7 +++++-- .../CommonAssets/Materials/UnlitColor.mat | 5 ++++- .../Materials/Unlit_GridMarkers_X1Y1.mat | 7 +++++-- .../Materials/Unlit_GridMarkers_X2Y1.mat | 7 +++++-- .../Materials/Unlit_GridMarkers_X6Y6.mat | 7 +++++-- .../CommonAssets/Materials/White_Mate.mat | 19 +++++++++++++++++-- .../CommonAssets/Materials/red_paint.mat | 19 ++++++++++++++++++- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../Broadleaf_Desktop_Field_Billboard.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- 54 files changed, 153 insertions(+), 62 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat index ebc55ab77c7..9b77f56116e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,15 +77,29 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossinessSource: 0 @@ -104,6 +118,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat index b986f171691..0170c78f49e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat index 3324b017b52..e82e01b9eee 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index 92544bbd192..83911281f63 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,11 +89,13 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -113,6 +115,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat index f72dc1c5593..9c58c028673 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat index 6a762d63127..b1a216c15ca 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat @@ -76,17 +76,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat index 25e83b95712..70c7ab653f4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -144,6 +144,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -177,6 +178,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -227,6 +229,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -264,7 +267,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat index 92ac58db5e1..7a441d35596 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,6 +84,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat index 78bf16e580d..da42f3641f8 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -144,6 +144,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -177,6 +178,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -227,6 +229,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -264,7 +267,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat index fbd64724964..e2a81ab5f1a 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat index b8772f55794..63a249c25d6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat index 46fc466d921..bff12099c9c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat @@ -125,6 +125,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AORemapMax: 1 @@ -139,6 +151,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CoatMask: 0 - _Cull: 2 @@ -171,6 +184,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 @@ -222,6 +236,7 @@ Material: - _SpecularAAThreshold: 0.2 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 @@ -249,7 +264,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} @@ -275,4 +290,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat index 169c1f55b9e..5fe5d5f0791 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat index 7f4baf7a9e1..7da2dbc9094 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat index 211c817fe72..7fa576d8bfa 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat index 1cda6db2ffe..baea98465ad 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat index add34d12b78..03ad36fdcc1 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat index 0b02be9d2bc..c2c7306ab1c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat index 1b07d2f7fd0..2c5bfdec6b2 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat index 463a493b0ff..1f85b1dc1be 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat index 051d4d60ba0..e6b13099036 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat index a5aa5db65ac..12396c9a33f 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat index 8da3b5e844f..ca8200597fe 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat index ae1b64d777b..1e6d20692f8 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat index 13e5cef96d8..db499876771 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat index 88627fc1a0c..746c0299e56 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat index 189fcb92605..b6656af6c03 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat index 144e79a94f0..c1112d74431 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat index a9e576a743a..ba3378789cf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat index 5a7c3dada6f..e2886ae8901 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat index c5f31841961..de315bc19b9 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat index 9277c95680e..61bd66e4394 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat index 66b18f0d45f..d6eb11601bc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat index 289833e4139..e655d75edfb 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat index f536b3042e6..f2d29f7764b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat index 2fcb79dcf09..2120eaf7a13 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat index bec1d8663dc..0eadc2651e4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat index 8fb496c79ea..b85a0b3c370 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat index e275f57b394..f2df624525f 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat index 6a9b0007eb9..544c6b1753e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat index e54b517f039..08bc98f2e6d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat index ce2792a63bf..bfef6ef07c4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat index 8826b439933..8792b2f035c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat index ab20da1d80d..9eddf1187e0 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat index dcb555a1741..17fa0bbea1d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat index 22335fa6912..553497efd29 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat index ab7be53b36d..98ffc43704e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat index 01ed1ba5243..acc49f50fbc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat index 3283ac58133..696325d529b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat index 22b121191b6..e45169023d6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat index b84effb6768..82342dbb32b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index e1a1a5021f5..f4713166e4a 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat index 1da54ac3a62..470ff1c2bb2 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat index 800e4d3eda7..3871ce98110 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 From 8660868fca73222bb2e4c752ac2cbbf3f5646a9c Mon Sep 17 00:00:00 2001 From: Erik Hakala Date: Mon, 25 Oct 2021 19:45:29 +0300 Subject: [PATCH 12/12] PostProcessing Scenes/ .mat files upgrade. --- .../145_SoftParticlesStackWithPP/Red.mat | 19 +++++++++++++++++-- .../SoftParticles.mat | 3 ++- .../146_MSAA_RenderToBackbuffer/BlueUnlit.mat | 4 +++- .../GreenUnlit.mat | 4 +++- .../146_MSAA_RenderToBackbuffer/RedUnlit.mat | 4 +++- .../YellowUnlit.mat | 4 +++- .../170_CameraCaptureAction/Material.mat | 5 ++++- 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat index 9287774a59f..bfb13e7852e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,10 +77,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,12 +116,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.19886708, b: 0.18396229, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0.19886705, b: 0.18396226, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat index ec934112c26..2ed339dc6eb 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat @@ -18,6 +18,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -129,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat index 934c1f65c1f..eddbc0b2009 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat index 977adcbe110..b9b57cc8f73 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat index 496794c0017..c637020dc0d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat index 0987c0c583b..99790ef4d8d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat index 202da4ad7a1..c2e469ddd82 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6