UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-08 00:04:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'EsotericSoftware/3.6' into 3.6

Browse Source
This commit is contained in:
Stephen Gowen 2017-10-18 10:24:45 -04:00
commit b385c8e6c6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
View File

@ -375,12 +375,10 @@ namespace Spine.Unity.Editor {
ISkeletonComponent skeletonComponent = GetTargetSkeletonComponent(property);
var validSkins = new List<Skin>();
if (skeletonComponent != null && targetAttribute.currentSkinOnly) {
Skin currentSkin = null;
var skinProperty = property.FindPropertyRelative(targetAttribute.skinField);
var skinProperty = property.FindBaseOrSiblingProperty(targetAttribute.skinField);
if (skinProperty != null) currentSkin = skeletonComponent.Skeleton.Data.FindSkin(skinProperty.stringValue);
currentSkin = currentSkin ?? skeletonComponent.Skeleton.Skin;