diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs index a8469d22d..c838b9ffe 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs @@ -236,7 +236,9 @@ namespace Spine.Unity.Editor { if (string.IsNullOrEmpty(textureSettingsRef.stringValue)) { var pmaTextureSettingsReferenceGUIDS = AssetDatabase.FindAssets("PMATexturePreset"); if (pmaTextureSettingsReferenceGUIDS.Length > 0) { - textureSettingsRef.stringValue = AssetDatabase.GUIDToAssetPath(pmaTextureSettingsReferenceGUIDS[0]); + var assetPath = AssetDatabase.GUIDToAssetPath(pmaTextureSettingsReferenceGUIDS[0]); + if (!string.IsNullOrEmpty(assetPath)) + textureSettingsRef.stringValue = assetPath; } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs index 27a2f0eaa..1b1df877e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs @@ -27,6 +27,10 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +#if UNITY_2019_3_OR_NEWER +#define MESH_SET_TRIANGLES_PROVIDES_LENGTH_PARAM +#endif + // Not for optimization. Do not disable. #define SPINE_TRIANGLECHECK // Avoid calling SetTriangles at the cost of checking for mesh differences (vertex counts, memberwise attachment list compare) every frame. //#define SPINE_DEBUG @@ -1117,7 +1121,11 @@ namespace Spine.Unity { mesh.subMeshCount = submeshCount; for (int i = 0; i < submeshCount; i++) +#if MESH_SET_TRIANGLES_PROVIDES_LENGTH_PARAM + mesh.SetTriangles(submeshesItems[i].Items, 0, submeshesItems[i].Count, i, false); +#else mesh.SetTriangles(submeshesItems[i].Items, i, false); +#endif } #endregion