Prechádzať zdrojové kódy

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

Mario Zechner 3 rokov pred
rodič
commit
2ddcf751e3

+ 1 - 1
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs

@@ -193,7 +193,7 @@ namespace Spine.Unity.Editor {
 				}
 
 				if (changeCheck.changed) {
-					if (requiresReload || serializedObject.ApplyModifiedProperties()) {
+					if (serializedObject.ApplyModifiedProperties() || requiresReload) {
 						this.Clear();
 						this.InitializeEditor();
 

+ 1 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs

@@ -105,7 +105,7 @@ namespace Spine.Unity.TK2D {
 			page.rendererObject = material;
 			region.page = page;
 			region.u = u;
-			region.u = v;
+			region.v = v;
 			region.u2 = u2;
 			region.v2 = v2;
 			region.rotate = regionRotated;