From 8f65c0254eae4643b25bab320d8024b1746efee5 Mon Sep 17 00:00:00 2001 From: Emiliana <38952746+emilianavt@users.noreply.github.com> Date: Sat, 15 Aug 2020 19:14:38 +0200 Subject: [PATCH] Prevented expressions getting stuck when expression detection is disabled or tracking is lost in `OpenSeeVRMDriver`. --- Examples/OpenSeeVRMDriver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/OpenSeeVRMDriver.cs b/Examples/OpenSeeVRMDriver.cs index a853d5f..4a0cb12 100644 --- a/Examples/OpenSeeVRMDriver.cs +++ b/Examples/OpenSeeVRMDriver.cs @@ -846,13 +846,13 @@ public class OpenSeeVRMDriver : MonoBehaviour { toggledExpression.triggered = false; if (!overridden && !trigger) { - if (openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) { + if (!openSeeExpression.enabled || openSeeExpression.expressionTime + 15f < Time.time || openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) { currentExpression = null; } else { currentExpression = expressionMap[openSeeExpression.expression]; currentExpression.triggered = true; } - } else if (openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) { + } else if (openSeeExpression.enabled && openSeeExpression.expressionTime + 15f > Time.time && openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) { if (expressionMap[openSeeExpression.expression].additive) expressionMap[openSeeExpression.expression].triggered = true; }