Update MA_TextureAtlasserProInspectorView.cs

Fix 2020.2+ mesh input fields.
maxartz15 · Apr 8, 2021 · 05b4ea9 · 05b4ea9
1 parent 0933abd
commit 05b4ea9
Showing 1 changed file with 36 additions and 35 deletions.
diff --git a/..._ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs b/..._ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
@@ -94,53 +94,54 @@ public override void UpdateView(Event e, Rect editorViewRect)
 					{
 						SerializedProperty modelGroupsSP = serializedObject.FindProperty("modelGroups");
 
-                        for (int i = 0; i < curWindow.textureAtlas.selectedTextureQuad.modelGroups.Count; i++)
+						for (int i = 0; i < curWindow.textureAtlas.selectedTextureQuad.modelGroups.Count; i++)
 						{
 							using (new GUILayout.VerticalScope(EditorStyles.helpBox))
 							{
-                                using (new GUILayout.HorizontalScope())
-                                {
+								using (new GUILayout.HorizontalScope())
+								{
 									curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].name = EditorGUILayout.TextField(curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].name);
-                                    if (GUILayout.Button("-", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
-                                    {
-                                        curWindow.textureAtlas.selectedTextureQuad.modelGroups.RemoveAt(i);
-                                        break;
-                                    }
-                                }
-
-                                SerializedProperty meshesSP = modelGroupsSP.GetArrayElementAtIndex(i).FindPropertyRelative("meshes");
+									if (GUILayout.Button("-", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
+									{
+										curWindow.textureAtlas.selectedTextureQuad.modelGroups.RemoveAt(i);
+										break;
+									}
+								}
+
+								SerializedProperty meshesSP = modelGroupsSP.GetArrayElementAtIndex(i).FindPropertyRelative("meshes");
 #if UNITY_2020_2_OR_NEWER
+								meshesSP.isExpanded = EditorGUILayout.Foldout(meshesSP.isExpanded, "Meshes", true);							
 #else
 								EditorGUILayout.PropertyField(meshesSP, false, GUILayout.ExpandWidth(false), GUILayout.MaxWidth(editorViewRect.width * 0.5f));
 #endif
 								if (meshesSP.isExpanded)
-                                {
-                                    for (int j = 0; j < curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Count; j++)
-                                    {
-                                        using (new GUILayout.HorizontalScope())
-                                        {
-                                            curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes[j] = (Mesh)EditorGUILayout.ObjectField(curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes[j], typeof(Mesh), false);
-                                            if (GUILayout.Button("-", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
-                                            {
-                                                curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.RemoveAt(j);
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-
-                                if (GUILayout.Button("+", EditorStyles.miniButton))
-                                {
-                                    curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Add(null);
-                                }
+								{
+									for (int j = 0; j < curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Count; j++)
+									{
+										using (new GUILayout.HorizontalScope())
+										{
+											curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes[j] = (Mesh)EditorGUILayout.ObjectField(curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes[j], typeof(Mesh), false);
+											if (GUILayout.Button("-", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
+											{
+												curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.RemoveAt(j);
+												break;
+											}
+										}
+									}
+								}
+
+								if (GUILayout.Button("+", EditorStyles.miniButton))
+								{
+									curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Add(null);
+								}
 							}
 						}
 
-                        if (GUILayout.Button("+", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
-                        {
-                            curWindow.textureAtlas.selectedTextureQuad.modelGroups.Add(new MA_ModelGroup() { name = MA_StringUtils.RandomAlphabetString(6) });
-                        }
-                    }
+						if (GUILayout.Button("+", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
+						{
+							curWindow.textureAtlas.selectedTextureQuad.modelGroups.Add(new MA_ModelGroup() { name = MA_StringUtils.RandomAlphabetString(6) });
+						}
+					}
 					else
 					{
 						curWindow.textureAtlas.selectedTextureQuad.modelGroups = new List<MA_ModelGroup>();