From 05c4ba0ebd96f71da69181dfca851609e2a3d521 Mon Sep 17 00:00:00 2001 From: yum Date: Fri, 3 Jul 2026 20:40:46 -0700 Subject: Work around thry locking bug --- 2ner.shader | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/2ner.shader b/2ner.shader index e2f4a83..a718be0 100644 --- a/2ner.shader +++ b/2ner.shader @@ -198,9 +198,8 @@ Shader "yum_food/2ner" [ThryToggle(_MATCAP0)]_Matcap0_Enabled("Enable", Float) = 0 _Matcap0("Matcap", 2D) = "white" {} [Toggle(_)]_Matcap0_Invert("Invert", Float) = 0 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Matcap0_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Matcap0_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Matcap0_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 _Matcap0_Strength("Strength", Float) = 1 //ifex _Matcap0_Mask_Enabled==0 @@ -222,9 +221,8 @@ Shader "yum_food/2ner" [ThryToggle(_MATCAP1)]_Matcap1_Enabled("Enable", Float) = 0 _Matcap1("Matcap", 2D) = "white" {} [Toggle(_)]_Matcap1_Invert("Invert", Float) = 0 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Matcap1_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Matcap1_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Matcap1_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 _Matcap1_Strength("Strength", Float) = 1 //ifex _Matcap1_Mask_Enabled==0 @@ -246,9 +244,8 @@ Shader "yum_food/2ner" [ThryToggle(_MATCAP2)]_Matcap2_Enabled("Enable", Float) = 0 _Matcap2("Matcap", 2D) = "white" {} [Toggle(_)]_Matcap2_Invert("Invert", Float) = 0 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Matcap2_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Matcap2_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Matcap2_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 _Matcap2_Strength("Strength", Float) = 1 //ifex _Matcap2_Mask_Enabled==0 @@ -270,14 +267,13 @@ Shader "yum_food/2ner" [HideInInspector] m_start_Rim_Lighting("Rim lighting", Float) = 0 //ifex _Rim_Lighting0_Enabled==0 [HideInInspector] m_start_Rim_Lighting0("Rim lighting 0", Float) = 0 - [ThryToggle(_RIM_LIGHTING0)]_Rim_Lighting0_Enabled("Enable", Float) = 0 + [DoNotLock] [ThryToggle(_RIM_LIGHTING0)]_Rim_Lighting0_Enabled("Enable", Float) = 0 _Rim_Lighting0_Center("Center", Range(0, 0.5)) = 0.5 _Rim_Lighting0_Power("Power", Float) = 5 _Rim_Lighting0_Color("Color", Color) = (1, 1, 1, 1) _Rim_Lighting0_Brightness("Brightness", Float) = 1 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Rim_Lighting0_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Rim_Lighting0_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Rim_Lighting0_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 //ifex _Rim_Lighting0_Mask_Enabled==0 [HideInInspector] m_start_Rim_Lighting0_Mask("Mask", Float) = 0 @@ -303,14 +299,13 @@ Shader "yum_food/2ner" //ifex _Rim_Lighting1_Enabled==0 [HideInInspector] m_start_Rim_Lighting1("Rim lighting 1", Float) = 0 - [ThryToggle(_RIM_LIGHTING1)]_Rim_Lighting1_Enabled("Enable", Float) = 0 + [DoNotLock] [ThryToggle(_RIM_LIGHTING1)]_Rim_Lighting1_Enabled("Enable", Float) = 0 _Rim_Lighting1_Center("Center", Range(0, 0.5)) = 0.5 _Rim_Lighting1_Power("Power", Float) = 5 _Rim_Lighting1_Color("Color", Color) = (1, 1, 1, 1) _Rim_Lighting1_Brightness("Brightness", Float) = 1 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Rim_Lighting1_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Rim_Lighting1_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Rim_Lighting1_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 //ifex _Rim_Lighting1_Mask_Enabled==0 [HideInInspector] m_start_Rim_Lighting1_Mask("Mask", Float) = 0 @@ -336,14 +331,13 @@ Shader "yum_food/2ner" //ifex _Rim_Lighting2_Enabled==0 [HideInInspector] m_start_Rim_Lighting2("Rim lighting 2", Float) = 0 - [ThryToggle(_RIM_LIGHTING2)]_Rim_Lighting2_Enabled("Enable", Float) = 0 + [DoNotLock] [ThryToggle(_RIM_LIGHTING2)]_Rim_Lighting2_Enabled("Enable", Float) = 0 _Rim_Lighting2_Center("Center", Range(0, 0.5)) = 0.5 _Rim_Lighting2_Power("Power", Float) = 5 _Rim_Lighting2_Color("Color", Color) = (1, 1, 1, 1) _Rim_Lighting2_Brightness("Brightness", Float) = 1 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Rim_Lighting2_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Rim_Lighting2_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Rim_Lighting2_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 //ifex _Rim_Lighting2_Mask_Enabled==0 [HideInInspector] m_start_Rim_Lighting2_Mask("Mask", Float) = 0 @@ -369,14 +363,13 @@ Shader "yum_food/2ner" //ifex _Rim_Lighting3_Enabled==0 [HideInInspector] m_start_Rim_Lighting3("Rim lighting 3", Float) = 0 - [ThryToggle(_RIM_LIGHTING3)]_Rim_Lighting3_Enabled("Enable", Float) = 0 + [DoNotLock] [ThryToggle(_RIM_LIGHTING3)]_Rim_Lighting3_Enabled("Enable", Float) = 0 _Rim_Lighting3_Center("Center", Range(0, 0.5)) = 0.5 _Rim_Lighting3_Power("Power", Float) = 5 _Rim_Lighting3_Color("Color", Color) = (1, 1, 1, 1) _Rim_Lighting3_Brightness("Brightness", Float) = 1 - [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] - _Rim_Lighting3_Mode("Mode", Int) = 0 - [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] + [DoNotLock] [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, AddProduct, 4)] _Rim_Lighting3_Mode("Mode", Int) = 0 + [DoNotLock] [ThryWideEnum(_0000b, 0, _0001b, 1, _0010b, 2, _0011b, 3, _0100b, 4, _0101b, 5, _0110b, 6, _0111b, 7, _1000b, 8, _1001b, 9, _1010b, 10, _1011b, 11, _1100b, 12, _1101b, 13, _1110b, 14, _1111b, 15)] _Rim_Lighting3_Target_Mask("Target mask (albedo|diffuse<<1|specular<<2)", Int) = 1 //ifex _Rim_Lighting3_Mask_Enabled==0 [HideInInspector] m_start_Rim_Lighting3_Mask("Mask", Float) = 0 -- cgit v1.2.3