[unity] Minor editor fixes.

spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs

@@ -237,8 +237,8 @@ namespace Spine.Unity.Editor {
 
 						using (new SpineInspectorUtility.LabelWidthScope()) {
 							// Optimization options
-							EditorGUILayout.PropertyField(meshes, MeshesLabel);
-							EditorGUILayout.PropertyField(immutableTriangles, ImmubleTrianglesLabel);
+							if (meshes != null) EditorGUILayout.PropertyField(meshes, MeshesLabel);
+							if (immutableTriangles != null) EditorGUILayout.PropertyField(immutableTriangles, ImmubleTrianglesLabel);
 							EditorGUILayout.PropertyField(tintBlack, TintBlackLabel);
 							EditorGUILayout.PropertyField(clearStateOnDisable, ClearStateOnDisableLabel);
 							EditorGUILayout.Space();
@@ -255,7 +255,7 @@ namespace Spine.Unity.Editor {
 
 						using (new SpineInspectorUtility.LabelWidthScope()) {
 							EditorGUILayout.LabelField("Vertex Data", EditorStyles.boldLabel);
-							EditorGUILayout.PropertyField(pmaVertexColors, PMAVertexColorsLabel);
+							if (pmaVertexColors != null) EditorGUILayout.PropertyField(pmaVertexColors, PMAVertexColorsLabel);
 
 							// Optional fields. May be disabled in SkeletonRenderer.
 							if (normals != null) EditorGUILayout.PropertyField(normals, NormalsLabel);

spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs

@@ -30,7 +30,7 @@
 
 #pragma warning disable 0219
 
-// Contributed by: Mitch Thompson
+// Original contribution by: Mitch Thompson
 
 #define SPINE_SKELETONANIMATOR
 using UnityEngine;
@@ -713,7 +713,8 @@ namespace Spine.Unity.Editor {
 		#endregion
 
 		#region Match SkeletonData with Atlases
-		static readonly AttachmentType[] NonAtlasTypes = { AttachmentType.Boundingbox, AttachmentType.Path };
+		//static readonly AttachmentType[] NonAtlasTypes = { AttachmentType.Boundingbox, AttachmentType.Path };
+		static readonly AttachmentType[] AtlasTypes = { AttachmentType.Region, AttachmentType.Linkedmesh, AttachmentType.Mesh };
 
 		static List<AtlasAsset> MultiAtlasDialog (List<string> requiredPaths, string initialDirectory, string filename = "") {
 			List<AtlasAsset> atlasAssets = new List<AtlasAsset>();
@@ -850,8 +851,8 @@ namespace Spine.Unity.Editor {
 								Debug.LogWarning(string.Format("Unidentified Attachment type: \"{0}\". Skeleton may have been exported from an incompatible Spine version.", typeString));
 								throw e;
 							}
-
-							if (NonAtlasTypes.Contains(attachmentType))
+								
+							if (!AtlasTypes.Contains(attachmentType))
 								continue;
 						}
 
@@ -1304,7 +1305,7 @@ namespace Spine.Unity.Editor {
 
 				if (!tintBlack) {
 					foreach (Material m in atlasAsset.materials) {
-						if (m.shader.name.Contains(PMAShaderQuery)) {
+						if (m.shader.name.Contains(TintBlackShaderQuery)) {
 							tintBlack = true;
 							break;
 						}