From 0e8248f6040a979ddf079343bfea98afd95c4212 Mon Sep 17 00:00:00 2001 From: FrancescoC-Unity Date: Wed, 1 Jul 2020 16:19:16 +0200 Subject: [PATCH] Workaround --- .../Runtime/Material/TerrainLit/TerrainLit.shader | 2 +- .../Runtime/Material/TerrainLit/TerrainLit_Basemap.shader | 2 +- com.unity.shadergraph/Editor/Drawing/PreviewManager.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit.shader index 206f5ed28ff..fd7dbf27aa5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit.shader @@ -80,7 +80,7 @@ Shader "HDRP/TerrainLit" #pragma multi_compile_instancing #pragma instancing_options assumeuniformscaling nomatrices nolightprobe nolightmap - #pragma multi_compile _ _ALPHATEST_ON + #pragma multi_compile_local _ _ALPHATEST_ON // All our shaders use same name for entry point #pragma vertex Vert diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_Basemap.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_Basemap.shader index 590613d2c9b..1db4e549dfd 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_Basemap.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/TerrainLit/TerrainLit_Basemap.shader @@ -51,7 +51,7 @@ Shader "Hidden/HDRP/TerrainLit_Basemap" #pragma multi_compile_instancing #pragma instancing_options assumeuniformscaling nomatrices nolightprobe nolightmap - #pragma multi_compile _ _ALPHATEST_ON + #pragma multi_compile_local _ _ALPHATEST_ON #pragma vertex Vert #pragma fragment Frag diff --git a/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs b/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs index 40090905856..eba9d817e98 100644 --- a/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs +++ b/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs @@ -799,6 +799,8 @@ void BeginCompile(PreviewRenderData renderData, string shaderStr) ShaderUtil.UpdateShaderAsset(shaderData.shader, shaderStr, false); } + CoreUtils.Destroy(shaderData.mat); + if (shaderData.mat == null) { shaderData.mat = new Material(shaderData.shader) { hideFlags = HideFlags.HideAndDontSave };