Skip to content

Ad [MainTexture] and [MainColor] macro on HDRP shader [Skip CI] #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2020
Merged

Ad [MainTexture] and [MainColor] macro on HDRP shader [Skip CI] #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Shader "HDRP/Lit"
// They are use to fill a SurfaceData. With a MaterialGraph this should not exist.

// Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear
_BaseColor("BaseColor", Color) = (1,1,1,1)
_BaseColorMap("BaseColorMap", 2D) = "white" {}
[MainColor] _BaseColor("BaseColor", Color) = (1,1,1,1)
[MainTexture] _BaseColorMap("BaseColorMap", 2D) = "white" {}
[HideInInspector] _BaseColorMap_MipInfo("_BaseColorMap_MipInfo", Vector) = (0, 0, 0, 0)

_Metallic("_Metallic", Range(0.0, 1.0)) = 0
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Shader "HDRP/LitTessellation"
// They are use to fill a SurfaceData. With a MaterialGraph this should not exist.

// Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear
_BaseColor("BaseColor", Color) = (1,1,1,1)
_BaseColorMap("BaseColorMap", 2D) = "white" {}
[MainColor] _BaseColor("BaseColor", Color) = (1,1,1,1)
[MainTexture] _BaseColorMap("BaseColorMap", 2D) = "white" {}
[HideInInspector] _BaseColorMap_MipInfo("_BaseColorMap_MipInfo", Vector) = (0, 0, 0, 0)

_Metallic("_Metallic", Range(0.0, 1.0)) = 0
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Shader "HDRP/Unlit"
Properties
{
// Be careful, do not change the name here to _Color. It will conflict with the "fake" parameters (see end of properties) required for GI.
_UnlitColor("Color", Color) = (1,1,1,1)
_UnlitColorMap("ColorMap", 2D) = "white" {}
[MainColor] _UnlitColor("Color", Color) = (1,1,1,1)
[MainTexture] _UnlitColorMap("ColorMap", 2D) = "white" {}

[HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0)
_EmissiveColorMap("EmissiveColorMap", 2D) = "white" {}
Expand Down