UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed casting exception when use custom atlas asset. Closes #1342.

Browse Source
This commit is contained in:
Harald Csaszar 2019-04-29 17:52:23 +02:00
parent 533203bf32
commit cd703b38cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs
View File

@ -1362,9 +1362,9 @@ namespace Spine.Unity.Editor {
bool pmaVertexColors = false; bool pmaVertexColors = false;
bool tintBlack = false; bool tintBlack = false;
foreach (SpineAtlasAsset atlasAsset in skeletonDataAsset.atlasAssets) { foreach (AtlasAssetBase atlasAsset in skeletonDataAsset.atlasAssets) {
if (!pmaVertexColors) { if (!pmaVertexColors) {
foreach (Material m in atlasAsset.materials) { foreach (Material m in atlasAsset.Materials) {
if (m.shader.name.Contains(PMAShaderQuery)) { if (m.shader.name.Contains(PMAShaderQuery)) {
pmaVertexColors = true; pmaVertexColors = true;
break; break;
@ -1373,7 +1373,7 @@ namespace Spine.Unity.Editor {
} }
if (!tintBlack) { if (!tintBlack) {
foreach (Material m in atlasAsset.materials) { foreach (Material m in atlasAsset.Materials) {
if (m.shader.name.Contains(TintBlackShaderQuery)) { if (m.shader.name.Contains(TintBlackShaderQuery)) {
tintBlack = true; tintBlack = true;
break; break;