diff --git a/com.unity.toonshader/Editor/UTS_GUIBase.cs b/com.unity.toonshader/Editor/UTS_GUIBase.cs index f63d40909..11244409e 100644 --- a/com.unity.toonshader/Editor/UTS_GUIBase.cs +++ b/com.unity.toonshader/Editor/UTS_GUIBase.cs @@ -29,7 +29,7 @@ public class UTS_GUIBase : UnityEditor.ShaderGUI { protected const float kVersionX = 0.0f; protected const float kVersionY = 0.0f; - protected const float kVersionZ = 2.0f; + protected const float kVersionZ = 3.0f; internal virtual string srpDefaultLightModeName { get; } internal virtual void TessellationSetting(Material materal) { } diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader index 1ad0d5d40..cbf4a9494 100644 --- a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader +++ b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader @@ -13,7 +13,7 @@ Shader "HDRP/Toon" [HideInInspector] [Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1 [HideInInspector] _utsVersionX("VersionX", Float) = 0 [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 1 + [HideInInspector] _utsVersionZ("VersionZ", Float) = 3 // Syntesized Textures _MainTexSynthesized("_MainTexSynthesized",2D) = "white" {} @@ -245,10 +245,7 @@ Shader "HDRP/Toon" // ----------------------------------------------------------------------------- // parameters for UTS // ----------------------------------------------------------------------------- - [HideInInspector] _simpleUI("SimpleUI", Int) = 0 - [HideInInspector] _utsVersionX("VersionX", Float) = 1 - [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 0 + [HideInInspector] _utsTechnique("Technique", int) = 0 //DWF [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1 diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader index 68d5310c1..97170cd40 100644 --- a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader +++ b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader @@ -12,7 +12,7 @@ Shader "HDRP/ToonTessellation" [HideInInspector] _simpleUI("SimpleUI", Int) = 0 [HideInInspector] _utsVersionX("VersionX", Float) = 0 [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 2 + [HideInInspector] _utsVersionZ("VersionZ", Float) = 3 // Syntesized Textures _MainTexSynthesized("_MainTexSynthesized",2D) = "white" {} _ShadowControlSynthesized("_ShadowControlSynthesized", 2D) = "white" {} diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader index a839d3292..cb352fce7 100644 --- a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader +++ b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader @@ -8,7 +8,7 @@ Shader "Toon (Built-in)" { [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1 [HideInInspector] _utsVersionX("VersionX", Float) = 0 [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 2 + [HideInInspector] _utsVersionZ("VersionZ", Float) = 3 [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1 diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader index 6ddad4447..e4f00a2a6 100644 --- a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader +++ b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader @@ -8,7 +8,7 @@ Shader "ToonTessellation (Built-in)" { [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1 [HideInInspector] _utsVersionX("VersionX", Float) = 0 [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 2 + [HideInInspector] _utsVersionZ("VersionZ", Float) = 3 [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1 diff --git a/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader b/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader index d35c4107d..a34dba060 100644 --- a/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader +++ b/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader @@ -9,7 +9,7 @@ Shader "Universal Render Pipeline/Toon" { [HideInInspector] [Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1 [HideInInspector] _utsVersionX("VersionX", Float) = 0 [HideInInspector] _utsVersionY("VersionY", Float) = 0 - [HideInInspector] _utsVersionZ("VersionZ", Float) = 2 + [HideInInspector] _utsVersionZ("VersionZ", Float) = 3 [HideInInspector] _utsTechnique("Technique", int) = 0 //DWF [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1