Fix MotionFade and PoseMotionImporter

Author: cubism-dev

Assets/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs

@@ -137,8 +137,6 @@ private void UpdateFade(ICubismFadeState fadeState)
 
             var time = Time.time;
 
-            var isDoneAllFadeIn = true;
-
             // Calculate MotionFade.
             for (var i = 0; i < playingMotions.Count; i++)
             {
@@ -222,18 +220,10 @@ private void UpdateFade(ICubismFadeState fadeState)
                             fadeMotion.ParameterFadeInTimes[index], fadeMotion.ParameterFadeOutTimes[index],
                             motionWeight, DestinationParts[j].Opacity);
                 }
-
-
-                if (erapsedTime > fadeInTime)
-                {
-                    continue;
-                }
-                isDoneAllFadeIn = false;
             }
 
-            if (!isDoneAllFadeIn || !fadeState.GetStateTransitionFinished())
+            if (!fadeState.GetStateTransitionFinished())
             {
-                // Do not process any motion that has never finished fade-in.
                 return;
             }
 
@@ -250,7 +240,7 @@ private void UpdateFade(ICubismFadeState fadeState)
                     continue;
                 }
 
-                // If fade-in of all motion has been completed, delete the motion that has been played back.
+                // If fade-in has been completed, delete the motion that has been played back.
                 fadeState.StopAnimation(i);
             }
         }

Assets/Live2D/Cubism/Framework/Pose/Editor/CubismPoseMotionImporter.cs

@@ -47,17 +47,17 @@ private static void RegisterModelImporter()
         private static void OnModelImport(CubismModel3JsonImporter sender, CubismModel model)
         {
             var shouldImportAsOriginalWorkflow = CubismUnityEditorMenu.ShouldImportAsOriginalWorkflow;
+            var pose3Json = sender.Model3Json.Pose3Json;
 
             // Fail silently...
-            if(!shouldImportAsOriginalWorkflow)
+            if(!shouldImportAsOriginalWorkflow || pose3Json == null)
             {
                 return;
             }
 
             var assetsDirectoryPath = Application.dataPath.Replace("Assets", "");
             var assetPath = sender.AssetPath.Replace(assetsDirectoryPath, "");
             var fileReferences = sender.Model3Json.FileReferences;
-            var pose3Json = sender.Model3Json.Pose3Json;
 
             // Create pose animation clip
             var motions = new List<CubismModel3Json.SerializableMotion>();