From 4482abecaa3905fd2d5c2599cbf612b056a31f24 Mon Sep 17 00:00:00 2001 From: slunity Date: Mon, 11 Jan 2021 14:08:06 -0500 Subject: [PATCH] StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 0f666e7b367..1a1f0927c38 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed issue with shadow mask and area lights. - Fixed an issue with the capture callback (now includes post processing results). - Fixed decal draw order for ShaderGraph decal materials. +- Fixed StackLit ShaderGraph surface option property block to only display energy conserving specular color option for the specular parametrization (case 1257050) ### Changed - Removed the material pass probe volumes evaluation mode. diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs index 54def1e40d3..e4b45b590db 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs @@ -33,7 +33,10 @@ protected override void CreatePropertyGUI() // StackLit specific properties: AddProperty("Base Color Parametrization", () => stackLitData.baseParametrization, (newValue) => stackLitData.baseParametrization = newValue); - AddProperty("Energy Conserving Specular", () => stackLitData.energyConservingSpecular, (newValue) => stackLitData.energyConservingSpecular = newValue, 1); + if (stackLitData.baseParametrization == StackLit.BaseParametrization.SpecularColor) + { + AddProperty("Energy Conserving Specular", () => stackLitData.energyConservingSpecular, (newValue) => stackLitData.energyConservingSpecular = newValue, 1); + } // Material type enables: context.AddLabel("Material Core Features", 0);