Merge pull request #82 from soupday/dev

Dev
soupday · Apr 25, 2023 · 552ff59 · 552ff59
2 parents 8b69655 + 6b69fdb
commit 552ff59
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/Editor/AnimPlayerGUI.cs b/Editor/AnimPlayerGUI.cs
@@ -74,8 +74,7 @@ public static void ClosePlayer()
             {
                 EditorApplication.update -= UpdateDelegate;
 
-                if (AnimationMode.InAnimationMode())
-                    AnimationMode.StopAnimationMode();
+                WindowManager.StopAnimationMode();
 
                 if (CharacterAnimator)       
                 {
@@ -133,7 +132,7 @@ static public void UpdateAnimatorClip(Animator animator, AnimationClip clip)
             if (doneInitFace) ResetFace(true, true);
 
             // stop animation mode
-            if (AnimationMode.InAnimationMode()) AnimationMode.StopAnimationMode();
+            WindowManager.StopAnimationMode();
 
             if (!animator || CharacterAnimator != animator) doneInitFace = false;
 

diff --git a/Editor/ColliderManagerEditor.cs b/Editor/ColliderManagerEditor.cs
@@ -298,7 +298,7 @@ public void UpdatePrefab(Object component)
 		{
 			WindowManager.HideAnimationPlayer(true);
 			WindowManager.HideAnimationRetargeter(true);
-			if (AnimationMode.InAnimationMode()) AnimationMode.StopAnimationMode();
+			WindowManager.StopAnimationMode();
 
 			GameObject prefabRoot = PrefabUtility.GetOutermostPrefabInstanceRoot(component);			
 			if (prefabRoot)

diff --git a/Editor/ImporterWindow.cs b/Editor/ImporterWindow.cs
@@ -397,7 +397,7 @@ private void OnGUI()
                 if (GUILayout.Button(new GUIContent(iconActionRefresh, "Reload the character list, for after adding or removing characters."),
                     GUILayout.Width(ACTION_BUTTON_SIZE), GUILayout.Height(ACTION_BUTTON_SIZE)))
                 {
-                    refreshAfterGUI = true;
+                    EditorApplication.delayCall += RefreshCharacterList;
                 }
                 GUILayout.FlexibleSpace();
                 GUILayout.EndHorizontal();
@@ -1290,8 +1290,8 @@ bool ShowBakedCharacter(GameObject bakedAsset)
         void RebuildCharacterPhysics()
         {
             WindowManager.HideAnimationPlayer(true);
-            WindowManager.HideAnimationRetargeter(true);            
-            if (AnimationMode.InAnimationMode()) AnimationMode.StopAnimationMode();
+            WindowManager.HideAnimationRetargeter(true);
+            WindowManager.StopAnimationMode();            
 
             GameObject prefabAsset = Physics.RebuildPhysics(contextCharacter);
 

diff --git a/Editor/Physics.cs b/Editor/Physics.cs
@@ -279,16 +279,15 @@ private void ReadPhysicsJson(QuickJSON physicsJson, QuickJSON characterJson)
 
         public GameObject AddPhysics()
         {
-            bool animationMode = AnimationMode.InAnimationMode();
-            if (animationMode) AnimationMode.StopAnimationMode();
+            bool animationMode = WindowManager.StopAnimationMode();
 
             AddColliders();
             AddCloth();
             AddSpringBones();
 
             prefabAsset = PrefabUtility.SaveAsPrefabAsset(prefabInstance, AssetDatabase.GetAssetPath(prefabAsset));
 
-            if (animationMode) AnimationMode.StartAnimationMode();
+            WindowManager.RestartAnimationMode(animationMode);
 
             return prefabAsset;
         }

diff --git a/Editor/Pipeline.cs b/Editor/Pipeline.cs
@@ -43,7 +43,7 @@ public enum MaterialQuality { None, Default, High, Baked }
 
     public static class Pipeline
     {
-        public const string VERSION = "1.4.8";
+        public const string VERSION = "1.4.9";
 
 #if HDRP_10_5_0_OR_NEWER
         // version

diff --git a/Editor/WeightMapperEditor.cs b/Editor/WeightMapperEditor.cs
@@ -65,12 +65,11 @@ public void OnClothInspectorGUI()
 			GUI.backgroundColor = Color.Lerp(background, Color.white, 0.25f);
 			if (GUILayout.Button("Rebuild Constraints", GUILayout.Width(BUTTON_WIDTH)))
 			{
-				bool animationMode = AnimationMode.InAnimationMode();
-				if (animationMode) AnimationMode.StopAnimationMode();
+				bool animationMode = WindowManager.StopAnimationMode();
 
 				weightMapper.ApplyWeightMap();
 
-				if (animationMode) AnimationMode.StartAnimationMode();
+				WindowManager.RestartAnimationMode(animationMode);
 			}
 			GUI.backgroundColor = background;
 			GUILayout.FlexibleSpace();
@@ -124,7 +123,7 @@ public void UpdatePrefab(Object component)
 		{
 			WindowManager.HideAnimationPlayer(true);
 			WindowManager.HideAnimationRetargeter(true);
-			if (AnimationMode.InAnimationMode()) AnimationMode.StopAnimationMode();
+			WindowManager.StopAnimationMode();
 
 			GameObject prefabRoot = PrefabUtility.GetOutermostPrefabInstanceRoot(component);
 			if (prefabRoot)

diff --git a/README.md b/README.md
@@ -17,23 +17,23 @@ Links
 [HDRP Version](https://github.com/soupday/cc_unity_tools_HDRP)
 
 Note: There are two verions of the HDRP package
-- [**CC Unity Tools HDRP10**](https://github.com/soupday/cc_unity_tools_HDRP/releases/tag/1.4.8.HDRP10) for Unity 2020.3 to 2021.1
-- [**CC Unity Tools HDRP12**](https://github.com/soupday/cc_unity_tools_HDRP/releases/tag/1.4.8.HDRP12) for Unity 2021.2 and upwards
+- [**CC Unity Tools HDRP10**](https://github.com/soupday/cc_unity_tools_HDRP/releases/tag/1.4.9.HDRP10) for Unity 2020.3 to 2021.1
+- [**CC Unity Tools HDRP12**](https://github.com/soupday/cc_unity_tools_HDRP/releases/tag/1.4.9.HDRP12) for Unity 2021.2 and upwards
 
 The main repository contains the HDRP10 version. See the releases page for the HDRP12 version.
 
 [URP Version](https://github.com/soupday/cc_unity_tools_URP)
 
 Note: There are two verions of the URP package
-- [**CC Unity Tools URP10**](https://github.com/soupday/cc_unity_tools_URP/releases/tag/1.4.8.URP10) for Unity 2020.3 to 2021.1
-- [**CC Unity Tools URP12**](https://github.com/soupday/cc_unity_tools_URP/releases/tag/1.4.8.URP12) for Unity 2021.2 and upwards
+- [**CC Unity Tools URP10**](https://github.com/soupday/cc_unity_tools_URP/releases/tag/1.4.9.URP10) for Unity 2020.3 to 2021.1
+- [**CC Unity Tools URP12**](https://github.com/soupday/cc_unity_tools_URP/releases/tag/1.4.9.URP12) for Unity 2021.2 and upwards
 
 The main repository contains the URP10 version. See the releases page for the URP12 version.
 
 [3D/Built-in Version](https://github.com/soupday/cc_unity_tools_3D)
 
 The built-in pipeline version is for Unity 2019.4 and upwards.
-- [**CC Unity Tools 3D**](https://github.com/soupday/cc_unity_tools_3D/releases/tag/1.4.8) for Unity 2019.4 and upwards
+- [**CC Unity Tools 3D**](https://github.com/soupday/cc_unity_tools_3D/releases/tag/1.4.9) for Unity 2019.4 and upwards
 
 How it works
 ============

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.soupday.cc3_unity_tools",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "displayName": "CC/iC Unity Tools HDRP",
   "description": "Unity importer for Character Creator 3 & 4 and iClone 7 and 8.",
   "unity": "2020.3",