max/MA_TextureAtlasser
1
0
Fork 0
mirror of https://github.com/maxartz15/MA_TextureAtlasser.git synced 2025-04-04 16:35:45 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: max:master
Branches Tags
max:master
max:1.8.5
max:1.8.4
max:1.8.3
max:1.8.2
max:1.8.1
max:1.8.0
max:1.7.5
max:1.7.4
max:1.7.3
max:1.7.2
max:1.7.1
max:1.7
max:1.6
max:1.6.1
max:1.5
max:1.4
max:1.3
max:1.2
max:1.1
max:1.0
..
compare: max:1.8.4
Branches Tags
max:master
max:1.8.5
max:1.8.4
max:1.8.3
max:1.8.2
max:1.8.1
max:1.8.0
max:1.7.5
max:1.7.4
max:1.7.3
max:1.7.2
max:1.7.1
max:1.7
max:1.6
max:1.6.1
max:1.5
max:1.4
max:1.3
max:1.2
max:1.1
max:1.0

No commits in common. "master" and "1.8.4" have entirely different histories.
master ... 1.8.4

1 changed files with 145 additions and 151 deletions
Show Stats Expand all files Collapse all files

8
Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
View File

@ -13,7 +13,6 @@ namespace MA_TextureAtlasserPro
private MA_TextureAtlasserProQuad lastSelectedQuad;
private bool isEditing = false;
private GUIStyle labelStyle = new GUIStyle(GUI.skin.label);
private Vector2 scrollPos = Vector2.zero;
public MA_TextureAtlasserProInspectorView(MA_TextureAtlasserProWindow currentEditorWindow, string title) : base(currentEditorWindow, title)
{
@ -38,10 +37,6 @@ namespace MA_TextureAtlasserPro
}
GUILayout.BeginArea(editorViewRect, EditorStyles.helpBox);
using (var scrollViewScope = new EditorGUILayout.ScrollViewScope(scrollPos, false, false))
{
scrollPos = scrollViewScope.scrollPosition;
GUILayout.BeginVertical(GUILayout.ExpandWidth(true));
GUILayout.Label("Quad Name");
@ -95,7 +90,6 @@ namespace MA_TextureAtlasserPro
SerializedObject serializedObject = new SerializedObject(curWindow.textureAtlas.selectedTextureQuad);
serializedObject.Update();
if (curWindow.textureAtlas.selectedTextureQuad.modelGroups != null)
{
SerializedProperty modelGroupsSP = serializedObject.FindProperty("modelGroups");
@ -170,7 +164,7 @@ namespace MA_TextureAtlasserPro
GUILayout.Label("x " + curWindow.textureAtlas.selectedTextureQuad.guiRect.x.ToString() + ", y " + curWindow.textureAtlas.selectedTextureQuad.guiRect.y.ToString());
GUILayout.Label("w " + curWindow.textureAtlas.selectedTextureQuad.guiRect.width.ToString() + ", h " + curWindow.textureAtlas.selectedTextureQuad.guiRect.height.ToString(), labelStyle);
}
GUILayout.EndVertical();
GUILayout.EndArea();
}