From 6cea68fc2b78c086abd46131b65b96c403aaa0ea Mon Sep 17 00:00:00 2001
From: H3idi-X <toshiyuki@unity3d.com>
Date: Sun, 27 Aug 2023 20:17:07 +0900
Subject: [PATCH] Task/hdrp outline issue (#329)

* Updated HDRP graphics test project version for Unity 2023.1.x

* fixed: null reference exception in HDRPToonGUI-Tessellation.cs
---
 .../HdrpGraphicsTest-2023.1/Packages/manifest.json        | 8 ++++----
 .../ProjectSettings/ProjectVersion.txt                    | 4 ++--
 .../ProjectSettings/VFXManager.asset                      | 4 ++--
 .../Editor/HDRP/HDRPToonGUI-Tessellation.cs               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TestProjects/HdrpGraphicsTest-2023.1/Packages/manifest.json b/TestProjects/HdrpGraphicsTest-2023.1/Packages/manifest.json
index 2a0b5c924..12d1c6758 100644
--- a/TestProjects/HdrpGraphicsTest-2023.1/Packages/manifest.json
+++ b/TestProjects/HdrpGraphicsTest-2023.1/Packages/manifest.json
@@ -1,20 +1,20 @@
 {
   "dependencies": {
-    "com.unity.ai.navigation": "1.1.3",
-    "com.unity.ide.rider": "3.0.22",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.ide.rider": "3.0.24",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.package-validation-suite": "0.10.0-preview",
     "com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git#bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9",
     "com.unity.recorder": "4.0.1",
     "com.unity.render-pipelines.high-definition": "15.0.6",
-    "com.unity.test-framework": "1.3.5",
+    "com.unity.test-framework": "1.3.7",
     "com.unity.test-framework.build": "0.0.1-preview.14",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",
     "com.unity.testframework.graphics": "7.17.1-exp.1",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.toonshader": "file:../../../com.unity.toonshader",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.management": "4.3.3",
+    "com.unity.xr.management": "4.4.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/ProjectVersion.txt b/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/ProjectVersion.txt
index da45772d5..88a373f37 100644
--- a/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/ProjectVersion.txt
+++ b/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2023.1.0f1
-m_EditorVersionWithRevision: 2023.1.0f1 (a008fa768e6c)
+m_EditorVersion: 2023.1.9f1
+m_EditorVersionWithRevision: 2023.1.9f1 (f3f94c8cdc49)
diff --git a/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/VFXManager.asset b/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/VFXManager.asset
index dc0483aaf..d5033c5a0 100644
--- a/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/VFXManager.asset
+++ b/TestProjects/HdrpGraphicsTest-2023.1/ProjectSettings/VFXManager.asset
@@ -12,7 +12,7 @@ VFXManager:
   m_MaxDeltaTime: 0.05
   m_MaxScrubTime: 30
   m_MaxCapacity: 100000000
-  m_CompiledVersion: 6
-  m_RuntimeVersion: 33
+  m_CompiledVersion: 7
+  m_RuntimeVersion: 34
   m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
   m_BatchEmptyLifetime: 300
diff --git a/com.unity.toonshader/Editor/HDRP/HDRPToonGUI-Tessellation.cs b/com.unity.toonshader/Editor/HDRP/HDRPToonGUI-Tessellation.cs
index 9a747d456..c88ed5e2e 100644
--- a/com.unity.toonshader/Editor/HDRP/HDRPToonGUI-Tessellation.cs
+++ b/com.unity.toonshader/Editor/HDRP/HDRPToonGUI-Tessellation.cs
@@ -98,7 +98,7 @@ void DrawDelayedFloatProperty(MaterialProperty prop, GUIContent content)
         }
         void TessellationModePopup()
         {
-            EditorGUI.showMixedValue = tessellationMode.hasMixedValue;
+            EditorGUI.showMixedValue = tessellationMode == null ? false: tessellationMode.hasMixedValue;
             TessellationMode mode = TessellationMode.None;
             mode = (TessellationMode)tessellationMode?.floatValue;