From 29177f2c5a60eada9fdcdbfa99f6377e7de7fbcb Mon Sep 17 00:00:00 2001 From: nekobako Date: Sat, 14 Sep 2024 09:55:49 +0900 Subject: [PATCH] fix: NullReferenceException when opening RO Simulator for default Menu Item (#1107) --- .../ReactiveObjects/ParameterAssignerPass.cs | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Editor/ReactiveObjects/ParameterAssignerPass.cs b/Editor/ReactiveObjects/ParameterAssignerPass.cs index 1801020e..f9be4c3e 100644 --- a/Editor/ReactiveObjects/ParameterAssignerPass.cs +++ b/Editor/ReactiveObjects/ParameterAssignerPass.cs @@ -184,17 +184,20 @@ namespace nadena.dev.modular_avatar.core.editor paramName = mami.Control?.parameter?.name; if (string.IsNullOrEmpty(paramName)) paramName = "___AutoProp/" + mami.GetInstanceID(); - var isDefault = mami.isDefault; - if (isDefaultOverrides?.TryGetValue(paramName, out var target) == true) - isDefault = ReferenceEquals(mami, target); + if (simulationInitialStates != null) + { + var isDefault = mami.isDefault; + if (isDefaultOverrides?.TryGetValue(paramName, out var target) == true) + isDefault = ReferenceEquals(mami, target); - if (isDefault) - { - simulationInitialStates[paramName] = mami.Control.value; - } - else - { - simulationInitialStates?.TryAdd(paramName, -999); + if (isDefault) + { + simulationInitialStates[paramName] = mami.Control.value; + } + else + { + simulationInitialStates.TryAdd(paramName, -999); + } } }