UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2018-06-15 15:32:32 +02:00
commit 38f66b8720
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

@ -1363,9 +1363,9 @@ namespace Spine.Unity.Editor {
bool pmaVertexColors = false; bool pmaVertexColors = false;
bool tintBlack = false; bool tintBlack = false;
foreach (SpineAtlasAsset atlasAsset in skeletonDataAsset.atlasAssets) { foreach (var 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;
@ -1374,7 +1374,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;