Update MA_TextureAtlasserProInspectorView.cs

Fix 2020.2+ mesh input fields.

Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs

@@ -94,51 +94,54 @@ namespace MA_TextureAtlasserPro
 					{
 						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)))
+									if (GUILayout.Button("-", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
-                                    {
+									{
-                                        curWindow.textureAtlas.selectedTextureQuad.modelGroups.RemoveAt(i);
+										curWindow.textureAtlas.selectedTextureQuad.modelGroups.RemoveAt(i);
-                                        break;
+										break;
-                                    }
+									}
-                                }
+								}
 
-                                SerializedProperty meshesSP = modelGroupsSP.GetArrayElementAtIndex(i).FindPropertyRelative("meshes");
+								SerializedProperty meshesSP = modelGroupsSP.GetArrayElementAtIndex(i).FindPropertyRelative("meshes");
-                                EditorGUILayout.PropertyField(meshesSP, false, GUILayout.ExpandWidth(false), GUILayout.MaxWidth(editorViewRect.width * 0.5f));
+#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 (meshesSP.isExpanded)
+								if (GUILayout.Button("+", EditorStyles.miniButton))
-                                {
+								{
-                                    for (int j = 0; j < curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Count; j++)
+									curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Add(null);
-                                    {
+								}
-                                        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))
+						if (GUILayout.Button("+", EditorStyles.miniButton, GUILayout.ExpandWidth(true)))
-                                {
+						{
-                                    curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Add(null);
+							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>();

Assets/MA_ToolBox/MA_Utilities/MeshUtils/MA_MeshUtils.cs

@@ -84,7 +84,12 @@ namespace MA_Mesh
 				newMesh.SetTriangles(mesh.GetTriangles(i), i);
 			}
 			newMesh.SetNormals(new List<Vector3>(mesh.normals));
-			newMesh.SetUVs(0, new List<Vector2>(mesh.uv));
+			for (int i = 0; i < 8; i++)
+			{
+				List<Vector2> uvs = new List<Vector2>();
+				mesh.GetUVs(i, uvs);
+				newMesh.SetUVs(i, uvs);
+			}
 			newMesh.SetTangents(new List<Vector4>(mesh.tangents));
 			newMesh.SetColors(new List<Color>(mesh.colors));
 

Assets/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs

@@ -199,7 +199,7 @@ namespace MA_Texture
                 if(flipY)             
                 {
                     //Y is 'flipped' because textures are made from left to right, bottom to top. We want to draw from left to right and top to bottom.
-                    for (int y = combineTexture.height; y > 0; y--)
+                    for (int y = combineTexture.height - 1; y >= 0; y--)
                     {
                         texture.SetPixel(x + offsetX, y + (texture.height - offsetY - combineTexture.height), combineTexture.GetPixel(x, y));
                     }

README.md

@@ -11,6 +11,7 @@ Texture atlas creator tool for Unity. <br> This tool is made to combine textures
 ### Unity versions
 - Latest release requires Unity 2018.3 or higher.
 - Releases before 1.8 should work with older Unity versions.
+- Upgrading to 1.8+ will break existing atlasses.
 
 ## Export options
 ### Meshes
@@ -23,4 +24,4 @@ Texture atlas creator tool for Unity. <br> This tool is made to combine textures
 
 ## Resources
 [Youtube video](https://youtu.be/PBRKlopkZP0) <br>
-[Website](https://maxartz15.com/ma-textureatlasser/)
+[Website](https://maxartz15.com/ma_textureatlas/)