From 97e6b196fcf0cbc2dd60234f99969994d52d0e65 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Mon, 8 Apr 2024 06:45:44 +0900 Subject: [PATCH] fix: error --- .../lilToon/CustomShaderResources/Properties/Default.lilblock | 2 +- .../CustomShaderResources/Properties/DefaultAll.lilblock | 2 +- Assets/lilToon/Editor/lilInspector.cs | 2 +- Assets/lilToon/Editor/lilMaterialUtils.cs | 2 +- Assets/lilToon/Shader/lts.shader | 2 +- Assets/lilToon/Shader/lts_cutout.shader | 2 +- Assets/lilToon/Shader/lts_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_cutout_oo.shader | 2 +- Assets/lilToon/Shader/lts_fur.shader | 2 +- Assets/lilToon/Shader/lts_fur_cutout.shader | 2 +- Assets/lilToon/Shader/lts_fur_two.shader | 2 +- Assets/lilToon/Shader/lts_furonly.shader | 2 +- Assets/lilToon/Shader/lts_furonly_cutout.shader | 2 +- Assets/lilToon/Shader/lts_furonly_two.shader | 2 +- Assets/lilToon/Shader/lts_gem.shader | 2 +- Assets/lilToon/Shader/lts_o.shader | 2 +- Assets/lilToon/Shader/lts_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_oo.shader | 2 +- Assets/lilToon/Shader/lts_overlay.shader | 2 +- Assets/lilToon/Shader/lts_overlay_one.shader | 2 +- Assets/lilToon/Shader/lts_ref.shader | 2 +- Assets/lilToon/Shader/lts_ref_blur.shader | 2 +- Assets/lilToon/Shader/lts_tess.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans.shader | 2 +- Assets/lilToon/Shader/lts_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans_oo.shader | 2 +- Assets/lilToon/Shader/lts_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti.shader | 2 +- Assets/lilToon/Shader/ltsmulti_fur.shader | 2 +- Assets/lilToon/Shader/ltsmulti_gem.shader | 2 +- Assets/lilToon/Shader/ltsmulti_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti_ref.shader | 2 +- Assets/lilToon/Shader/ltspass_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_proponly.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_transparent.shader | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock index 46f85bd1..aa2e358d 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock @@ -203,7 +203,7 @@ //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock index df492442..f66bc464 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock @@ -203,7 +203,7 @@ //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Editor/lilInspector.cs b/Assets/lilToon/Editor/lilInspector.cs index e74a07d7..ab267d15 100644 --- a/Assets/lilToon/Editor/lilInspector.cs +++ b/Assets/lilToon/Editor/lilInspector.cs @@ -2656,7 +2656,7 @@ private void DrawAdvancedGUI(Material material) { if(ShouldDrawBlock(PropertyBlock.RimShade)) { - edSet.isShowRimShade = lilEditorGUI.Foldout(GetLoc("sRimShade"), edSet.isShowRimShade); + edSet.isShowRimShade = lilEditorGUI.Foldout("RimShade", edSet.isShowRimShade); DrawMenuButton(GetLoc("sAnchorRimShade"), PropertyBlock.RimShade); if(edSet.isShowRimShade) { diff --git a/Assets/lilToon/Editor/lilMaterialUtils.cs b/Assets/lilToon/Editor/lilMaterialUtils.cs index d145e8b6..06ab27e0 100644 --- a/Assets/lilToon/Editor/lilMaterialUtils.cs +++ b/Assets/lilToon/Editor/lilMaterialUtils.cs @@ -473,7 +473,7 @@ public static void SetupMultiMaterial(Material material) public static void SetupMultiMaterial(Material[] materials, AnimationClip[] clips) { - var ms = materials.Where(m => new lilToonInspector.MaterialType(m, false).isMulti).ToArray(); + var ms = materials.Where(m => m.shader.name.Contains("Multi")).ToArray(); foreach(var binding in clips.SelectMany(c => AnimationUtility.GetCurveBindings(c)).ToArray()) { string propname = binding.propertyName; diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index 583e2c83..d09bae19 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -207,7 +207,7 @@ Shader "lilToon" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index 11a5e498..6ec5cb33 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonCutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index 91d28608..1f8fcf22 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonCutoutOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index 010a6957..36bde42a 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index c563c837..f17d06ad 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFur" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 93acdecf..9d452303 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFurCutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index 529f01c2..6c7488bc 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFurTwoPass" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index b636d019..20c88496 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index 77bc4569..02b38f42 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index c7889805..1fe09226 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index 35910aee..bf3901a6 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonGem" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 5710fb63..e77fdb57 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index 3cf79fb5..9b27f730 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOnePassTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index 75120c5c..f308b59f 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOnePassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index 3088846f..7d5746c4 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOutlineOnly" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index ce976e6d..fe6206bc 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOverlay" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 2a40f2ca..2d228bf5 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 5446725e..f7886b12 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonRefraction" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index ade11021..9da407d1 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonRefractionBlur" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index 14f12048..30212260 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellation" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index c1de9ea3..7ae31a74 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationCutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index cd01048b..ba3c6181 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationCutoutOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 2bba04be..9a7fe44d 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 7ef220bf..b2af0a3b 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index f914a268..4dc78cbc 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 3a1dcea8..7a70319e 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 9404c14c..69422f79 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index ac5d1acf..b0363b18 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index e8f5b751..3b1588d0 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index 56463cc3..c5c08415 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index 6a074b2f..ed014545 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index c495becd..aff8ba8e 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 516eaead..1071a953 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTwoPassTransparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 14fb1b54..d1960d45 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index d4923b78..e76529b6 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -207,7 +207,7 @@ Shader "_lil/lilToonMulti" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index 9148ffed..33ba9cb5 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonMultiFur" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 2ba85bde..942c9ea5 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonMultiGem" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index a97fe3b4..65c99b58 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonMultiOutline" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 5c364b07..a33b668c 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -207,7 +207,7 @@ Shader "Hidden/lilToonMultiRefraction" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index 1678203e..5e225864 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_cutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index 0258d4c5..04e39226 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_opaque" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index 6d5d67cc..abb9be6e 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_proponly" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index 30a9cbd9..c8234e2b 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_tess_cutout" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index 21c613c1..8aace3ee 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_tess_opaque" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index d6663795..f8e4d521 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_tess_transparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index 7785fae3..4c1efdd9 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -207,7 +207,7 @@ Shader "Hidden/ltspass_transparent" //---------------------------------------------------------------------------------------------------------------------- // Rim Shade - [lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0 + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0