Skip to content

Commit bb6c957

Browse files
authored
Merge pull request #394 from thebanjomatic/nearplanefade
fix(nearplanefade) multi_compile _NearPlaneFadeOn
2 parents 8839980 + ca6bf79 commit bb6c957

8 files changed

+8
-8
lines changed

Assets/HoloToolkit/Utilities/Shaders/BlinnPhongConfigurable.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Shader "HoloToolkit/BlinnPhong Configurable"
6868
#pragma shader_feature _USEMAINTEX_ON
6969
#pragma shader_feature _USEBUMPMAP_ON
7070
#pragma shader_feature _USEEMISSIONTEX_ON
71-
#pragma shader_feature _NEAR_PLANE_FADE_ON
71+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
7272

7373
#include "HoloToolkitCommon.cginc"
7474
#include "BlinnPhongConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/BlinnPhongConfigurableTransparent.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Shader "HoloToolkit/BlinnPhong Configurable Transparent"
6868
#pragma shader_feature _USEMAINTEX_ON
6969
#pragma shader_feature _USEBUMPMAP_ON
7070
#pragma shader_feature _USEEMISSIONTEX_ON
71-
#pragma shader_feature _NEAR_PLANE_FADE_ON
71+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
7272

7373
#include "HoloToolkitCommon.cginc"
7474
#include "BlinnPhongConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/LambertianConfigurable.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Shader "HoloToolkit/Lambertian Configurable"
6161
#pragma shader_feature _USEMAINTEX_ON
6262
#pragma shader_feature _USEBUMPMAP_ON
6363
#pragma shader_feature _USEEMISSIONTEX_ON
64-
#pragma shader_feature _NEAR_PLANE_FADE_ON
64+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
6565

6666
#include "HoloToolkitCommon.cginc"
6767
#include "LambertianConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/LambertianConfigurableTransparent.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Shader "HoloToolkit/Lambertian Configurable Transparent"
6161
#pragma shader_feature _USEMAINTEX_ON
6262
#pragma shader_feature _USEBUMPMAP_ON
6363
#pragma shader_feature _USEEMISSIONTEX_ON
64-
#pragma shader_feature _NEAR_PLANE_FADE_ON
64+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
6565

6666
#include "HoloToolkitCommon.cginc"
6767
#include "LambertianConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/UnlitConfigurable.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Shader "HoloToolkit/Unlit Configurable"
5555

5656
#pragma shader_feature _USECOLOR_ON
5757
#pragma shader_feature _USEMAINTEX_ON
58-
#pragma shader_feature _NEAR_PLANE_FADE_ON
58+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
5959

6060
#include "HoloToolkitCommon.cginc"
6161
#include "UnlitConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/UnlitConfigurableTransparent.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Shader "HoloToolkit/Unlit Configurable Transparent"
5555

5656
#pragma shader_feature _USECOLOR_ON
5757
#pragma shader_feature _USEMAINTEX_ON
58-
#pragma shader_feature _NEAR_PLANE_FADE_ON
58+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
5959

6060
#include "HoloToolkitCommon.cginc"
6161
#include "UnlitConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/VertexLitConfigurable.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Shader "HoloToolkit/Vertex Lit Configurable"
6363
#pragma shader_feature _USECOLOR_ON
6464
#pragma shader_feature _USEMAINTEX_ON
6565
#pragma shader_feature _USEEMISSIONTEX_ON
66-
#pragma shader_feature _NEAR_PLANE_FADE_ON
66+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
6767

6868
#include "HoloToolkitCommon.cginc"
6969
#include "VertexLitConfigurable.cginc"

Assets/HoloToolkit/Utilities/Shaders/VertexLitConfigurableTransparent.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Shader "HoloToolkit/Vertex Lit Configurable Transparent"
6363
#pragma shader_feature _USECOLOR_ON
6464
#pragma shader_feature _USEMAINTEX_ON
6565
#pragma shader_feature _USEEMISSIONTEX_ON
66-
#pragma shader_feature _NEAR_PLANE_FADE_ON
66+
#pragma multi_compile __ _NEAR_PLANE_FADE_ON
6767

6868
#include "HoloToolkitCommon.cginc"
6969
#include "VertexLitConfigurable.cginc"

0 commit comments

Comments
 (0)