From e0d561af37dc7a38ee959b3b4a3d06f3293b30b6 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 23 Jun 2021 20:32:07 +0900 Subject: [PATCH] Don't use multi_compile_local (because 2019.1 or later function...) --- .../VRM10/vrmc_materials_mtoon.shader | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader index beae6a3c5..931d0c00e 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader @@ -88,11 +88,11 @@ Shader "Hidden/VRM10/vrmc_materials_mtoon" #pragma multi_compile_fog #pragma multi_compile_instancing - #pragma multi_compile_local __ _ALPHATEST_ON _ALPHABLEND_ON - #pragma multi_compile_local __ _NORMALMAP - #pragma multi_compile_local __ _MTOON_EMISSIVEMAP - #pragma multi_compile_local __ _MTOON_RIMMAP - #pragma multi_compile_local __ _MTOON_PARAMETERMAP + #pragma multi_compile __ _ALPHATEST_ON _ALPHABLEND_ON + #pragma multi_compile __ _NORMALMAP + #pragma multi_compile __ _MTOON_EMISSIVEMAP + #pragma multi_compile __ _MTOON_RIMMAP + #pragma multi_compile __ _MTOON_PARAMETERMAP #pragma vertex MToonVertex #pragma fragment MToonFragment @@ -123,18 +123,18 @@ Shader "Hidden/VRM10/vrmc_materials_mtoon" #pragma multi_compile_fog #pragma multi_compile_instancing - #pragma multi_compile_local __ _ALPHATEST_ON _ALPHABLEND_ON - #pragma multi_compile_local __ _NORMALMAP - #pragma multi_compile_local __ _MTOON_EMISSIVEMAP - #pragma multi_compile_local __ _MTOON_RIMMAP - #pragma multi_compile_local __ _MTOON_PARAMETERMAP - #pragma multi_compile_local __ _MTOON_OUTLINE_WORLD _MTOON_OUTLINE_SCREEN - - #define MTOON_PASS_OUTLINE + #pragma multi_compile __ _ALPHATEST_ON _ALPHABLEND_ON + #pragma multi_compile __ _NORMALMAP + #pragma multi_compile __ _MTOON_EMISSIVEMAP + #pragma multi_compile __ _MTOON_RIMMAP + #pragma multi_compile __ _MTOON_PARAMETERMAP + #pragma multi_compile __ _MTOON_OUTLINE_WORLD _MTOON_OUTLINE_SCREEN #pragma vertex MToonVertex #pragma fragment MToonFragment + #define MTOON_PASS_OUTLINE + #include "./vrmc_materials_mtoon_forward_vertex.hlsl" #include "./vrmc_materials_mtoon_forward_fragment.hlsl" ENDHLSL @@ -161,11 +161,11 @@ Shader "Hidden/VRM10/vrmc_materials_mtoon" #pragma multi_compile_fog #pragma multi_compile_instancing - #pragma multi_compile_local __ _ALPHATEST_ON _ALPHABLEND_ON - #pragma multi_compile_local __ _NORMALMAP - #pragma multi_compile_local __ _MTOON_EMISSIVEMAP - #pragma multi_compile_local __ _MTOON_RIMMAP - #pragma multi_compile_local __ _MTOON_PARAMETERMAP + #pragma multi_compile __ _ALPHATEST_ON _ALPHABLEND_ON + #pragma multi_compile __ _NORMALMAP + #pragma multi_compile __ _MTOON_EMISSIVEMAP + #pragma multi_compile __ _MTOON_RIMMAP + #pragma multi_compile __ _MTOON_PARAMETERMAP #pragma vertex MToonVertex #pragma fragment MToonFragment @@ -192,7 +192,7 @@ Shader "Hidden/VRM10/vrmc_materials_mtoon" #pragma multi_compile_shadowcaster nolightmap nodynlightmap nodirlightmap novertexlight #pragma multi_compile_instancing - #pragma multi_compile_local __ _ALPHATEST_ON _ALPHABLEND_ON + #pragma multi_compile __ _ALPHATEST_ON _ALPHABLEND_ON // Use unity standard shadow implementation. // internal usage: