diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl index da20dcb24..7ef5b20d0 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_define.hlsl @@ -71,7 +71,7 @@ inline bool MToon_IsParameterMapOn() // Compile-time constant inline bool MToon_IsOutlineModeWorldCoordinates() { - #if defined(MTOON_OUTLINE_WIDTH_WORLD) + #if defined(_MTOON_OUTLINE_WORLD) return true; #else return false; @@ -81,7 +81,7 @@ inline bool MToon_IsOutlineModeWorldCoordinates() // Compile-time constant inline bool MToon_IsOutlineModeScreenCoordinates() { - #if defined(MTOON_OUTLINE_WIDTH_SCREEN) + #if defined(_MTOON_OUTLINE_SCREEN) return true; #else return false; diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl index d9c024edc..7f361cf32 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl @@ -40,7 +40,7 @@ inline VertexPositionInfo MToon_GetOutlineVertex(const float3 positionOS, const else if (MToon_IsOutlineModeScreenCoordinates()) { const float3 positionWS = mul(unity_ObjectToWorld, float4(positionOS, 1)).xyz; - const half outlineWidth = _OutlineWidth * UNITY_SAMPLE_TEX2D_LOD(_OutlineWidthTex, uv, 0); + const half outlineWidth = MToon_GetOutlineVertex_OutlineWidth(uv); const float4 nearUpperRight = mul(unity_CameraInvProjection, float4(1, 1, UNITY_NEAR_CLIP_VALUE, _ProjectionParams.y)); const half aspect = abs(nearUpperRight.y / nearUpperRight.x);