Merge branch 'master' into develop

This commit is contained in:
2020-06-29 22:19:31 -07:00
11 changed files with 28 additions and 19 deletions

View File

@ -22,7 +22,7 @@ Shader "ConformalDecals/Feature/Bumped"
}
SubShader
{
Tags { "Queue" = "Geometry+100" }
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
Cull [_Cull]
Ztest LEqual

View File

@ -25,7 +25,7 @@ Shader "ConformalDecals/Paint/Diffuse"
}
SubShader
{
Tags { "Queue" = "Geometry+100" }
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
Cull [_Cull]
Ztest LEqual

View File

@ -27,7 +27,7 @@ Shader "ConformalDecals/Paint/DiffuseSDF"
}
SubShader
{
Tags { "Queue" = "Geometry+100" }
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
Cull [_Cull]
Ztest LEqual

View File

@ -30,7 +30,7 @@ Shader "ConformalDecals/Paint/Specular"
}
SubShader
{
Tags { "Queue" = "Geometry+100" }
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
Cull [_Cull]
Ztest LEqual

View File

@ -32,7 +32,7 @@ Shader "ConformalDecals/Paint/SpecularSDF"
}
SubShader
{
Tags { "Queue" = "Geometry+100" }
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
Cull [_Cull]
Ztest LEqual

View File

@ -12,7 +12,7 @@ Shader "ConformalDecals/SelectionGlow"
}
SubShader
{
Tags { "Queue" = "Transparent" }
Tags { "Queue" = "Transparent" "IgnoreProjector" = "true" }
Cull Back
ZWrite Off