From ae1bec1e954bafb1c934dd2a58f75fac8f144e28 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Tue, 2 Feb 2021 14:10:12 +0900 Subject: [PATCH] sum expression override rate method is changed from max to muladd. --- .../Components/Expression/DefaultExpressionValidator.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/VRM10/Runtime/Components/Expression/DefaultExpressionValidator.cs b/Assets/VRM10/Runtime/Components/Expression/DefaultExpressionValidator.cs index 3825b45bd..acd710a53 100644 --- a/Assets/VRM10/Runtime/Components/Expression/DefaultExpressionValidator.cs +++ b/Assets/VRM10/Runtime/Components/Expression/DefaultExpressionValidator.cs @@ -42,15 +42,15 @@ namespace UniVRM10 // Override rate without targeting myself. if (!key.IsBlink) { - blinkOverrideRate = Mathf.Max(blinkOverrideRate, GetOverrideRate(expression.OverrideBlink, weight)); + blinkOverrideRate += GetOverrideRate(expression.OverrideBlink, weight); } if (!key.IsLookAt) { - lookAtOverrideRate = Mathf.Max(lookAtOverrideRate, GetOverrideRate(expression.OverrideLookAt, weight)); + lookAtOverrideRate += GetOverrideRate(expression.OverrideLookAt, weight); } if (!key.IsMouth) { - mouthOverrideRate = Mathf.Max(mouthOverrideRate, GetOverrideRate(expression.OverrideMouth, weight)); + mouthOverrideRate += GetOverrideRate(expression.OverrideMouth, weight); } }