From 61843ccadda29f3a075ccbfe874b4cb30b81e23e Mon Sep 17 00:00:00 2001
From: Masataka SUMI <santarh@gmail.com>
Date: Wed, 23 Jun 2021 20:38:40 +0900
Subject: [PATCH] Apply emissionColor if emissionMap was none.

---
 .../VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl
index 1fce9955f..bee7da2dd 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl
+++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl
@@ -87,9 +87,16 @@ inline half3 GetMToonLighting_GlobalIllumination(const UnityLighting unityLight,
 
 inline half3 GetMToonLighting_Emissive(const MToonInput input)
 {
-    if (MToon_IsForwardBasePass() && MToon_IsEmissiveMapOn())
+    if (MToon_IsForwardBasePass())
     {
-        return UNITY_SAMPLE_TEX2D(_EmissionMap, input.uv).rgb * _EmissionColor.rgb;
+        if (MToon_IsEmissiveMapOn())
+        {
+            return UNITY_SAMPLE_TEX2D(_EmissionMap, input.uv).rgb * _EmissionColor.rgb;
+        }
+        else
+        {
+            return _EmissionColor.rgb;
+        }
     }
     else
     {