Browse Source

SkeletonAnimator update
Unity5 compatibility pass

Fenrisul 10 years ago
parent
commit
9c7b95ff30
77 changed files with 354 additions and 42 deletions
  1. 2 0
      spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta
  2. 2 0
      spine-unity/Assets/Examples/Scripts/Chimera.cs.meta
  3. 2 0
      spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta
  4. 2 0
      spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta
  5. 2 0
      spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta
  6. 2 0
      spine-unity/Assets/Examples/Scripts/Goblins.cs.meta
  7. 2 0
      spine-unity/Assets/Examples/Scripts/Raptor.cs.meta
  8. 2 0
      spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta
  9. 4 4
      spine-unity/Assets/Examples/Scripts/SpineboyController.cs
  10. 2 0
      spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta
  11. 2 0
      spine-unity/Assets/spine-unity/AtlasAsset.cs.meta
  12. 2 0
      spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta
  13. 2 0
      spine-unity/Assets/spine-unity/BoneFollower.cs.meta
  14. 2 0
      spine-unity/Assets/spine-unity/CustomSkin.cs.meta
  15. 2 0
      spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta
  16. 2 0
      spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta
  17. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta
  18. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta
  19. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta
  20. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta
  21. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta
  22. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta
  23. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta
  24. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta
  25. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta
  26. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta
  27. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta
  28. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta
  29. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta
  30. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta
  31. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta
  32. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta
  33. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta
  34. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta
  35. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta
  36. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta
  37. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta
  38. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta
  39. 6 0
      spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta
  40. 2 0
      spine-unity/Assets/spine-unity/Editor/Menus.cs.meta
  41. 2 0
      spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta
  42. 5 4
      spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs
  43. 2 0
      spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta
  44. 56 10
      spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs
  45. 2 0
      spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta
  46. 5 5
      spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs
  47. 2 0
      spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta
  48. 2 0
      spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta
  49. 2 0
      spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta
  50. 2 0
      spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta
  51. 2 0
      spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta
  52. 2 0
      spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta
  53. 2 0
      spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta
  54. 2 0
      spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta
  55. 2 0
      spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta
  56. 2 0
      spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta
  57. 2 0
      spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta
  58. 42 3
      spine-unity/Assets/spine-unity/SkeletonAnimator.cs
  59. 2 0
      spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta
  60. 2 0
      spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta
  61. 2 0
      spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta
  62. 3 3
      spine-unity/Assets/spine-unity/SkeletonRenderer.cs
  63. 2 0
      spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta
  64. 4 4
      spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs
  65. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta
  66. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta
  67. 2 2
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs
  68. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta
  69. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta
  70. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta
  71. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta
  72. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta
  73. 3 3
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs
  74. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta
  75. 4 4
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs
  76. 2 0
      spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta
  77. 2 0
      spine-unity/Assets/spine-unity/SpineAttributes.cs.meta

+ 2 - 0
spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/Chimera.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/DynamicSpineBone.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/Goblins.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/Raptor.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/Spineboy.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
spine-unity/Assets/Examples/Scripts/SpineboyController.cs

@@ -68,13 +68,13 @@ public class SpineboyController : MonoBehaviour {
 
 
 				if (absX > 0.7f) {
 				if (absX > 0.7f) {
 					SetAnimation(runAnimation, true);
 					SetAnimation(runAnimation, true);
-					rigidbody2D.velocity = new Vector2(runVelocity * Mathf.Sign(x), rigidbody2D.velocity.y);
+					GetComponent<Rigidbody2D>().velocity = new Vector2(runVelocity * Mathf.Sign(x), GetComponent<Rigidbody2D>().velocity.y);
 				} else if (absX > 0) {
 				} else if (absX > 0) {
 						SetAnimation(walkAnimation, true);
 						SetAnimation(walkAnimation, true);
-						rigidbody2D.velocity = new Vector2(walkVelocity * Mathf.Sign(x), rigidbody2D.velocity.y);
+						GetComponent<Rigidbody2D>().velocity = new Vector2(walkVelocity * Mathf.Sign(x), GetComponent<Rigidbody2D>().velocity.y);
 					} else {
 					} else {
 						SetAnimation(idleAnimation, true);
 						SetAnimation(idleAnimation, true);
-						rigidbody2D.velocity = new Vector2(0, rigidbody2D.velocity.y);
+						GetComponent<Rigidbody2D>().velocity = new Vector2(0, GetComponent<Rigidbody2D>().velocity.y);
 					}
 					}
 			} else {
 			} else {
 				if (skeletonAnimation.state.GetCurrent(0).Animation.Name != hitAnimation)
 				if (skeletonAnimation.state.GetCurrent(0).Animation.Name != hitAnimation)
@@ -101,7 +101,7 @@ public class SpineboyController : MonoBehaviour {
 			} else {
 			} else {
 				skeletonAnimation.state.SetAnimation(0, hitAnimation, false);
 				skeletonAnimation.state.SetAnimation(0, hitAnimation, false);
 				skeletonAnimation.state.AddAnimation(0, currentAnimation, true, 0);
 				skeletonAnimation.state.AddAnimation(0, currentAnimation, true, 0);
-				rigidbody2D.velocity = new Vector2(0, rigidbody2D.velocity.y);
+				GetComponent<Rigidbody2D>().velocity = new Vector2(0, GetComponent<Rigidbody2D>().velocity.y);
 				hit = true;
 				hit = true;
 			}
 			}
 
 

+ 2 - 0
spine-unity/Assets/Examples/Scripts/SpineboyController.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/AtlasAsset.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/AtlasRegionAttacher.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/BoneFollower.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/CustomSkin.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/AtlasAssetInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/BoneFollowerInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-animation.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-animationRoot.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-bone.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-boneNib.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-boundingBox.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -1
   textureFormat: -1
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-constraintNib.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-event.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-hingeChain.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -1
   textureFormat: -1
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: -1
     wrapMode: -1
   nPOTScale: 1
   nPOTScale: 1
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-image.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-mesh.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -1
   textureFormat: -1
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-null.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-poseBones.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-skeleton.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-skeletonUtility.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-skin.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-skinPlaceholder.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-skinsRoot.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-slot.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-slotRoot.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -1
   textureFormat: -1
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-spine.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-subMeshRenderer.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -1
   textureFormat: -1
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-warning.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 0
spine-unity/Assets/spine-unity/Editor/GUI/icon-weights.png.meta

@@ -20,6 +20,9 @@ TextureImporter:
   isReadable: 0
   isReadable: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   seamlessCubemap: 0
   textureFormat: -3
   textureFormat: -3
   maxTextureSize: 1024
   maxTextureSize: 1024
@@ -30,6 +33,7 @@ TextureImporter:
     wrapMode: 1
     wrapMode: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
   compressionQuality: 50
   spriteMode: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteExtrude: 1
@@ -45,3 +49,5 @@ TextureImporter:
     sprites: []
     sprites: []
   spritePackingTag: 
   spritePackingTag: 
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/Menus.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 4
spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs

@@ -27,6 +27,11 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
  *****************************************************************************/
+
+/*****************************************************************************
+ * SkeletonAnimatorInspector created by Mitch Thompson
+ * Full irrevocable rights and permissions granted to Esoteric Software
+*****************************************************************************/
 using System;
 using System;
 using UnityEditor;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine;
@@ -39,15 +44,11 @@ public class SkeletonAnimatorInspector : SkeletonRendererInspector {
 	protected override void OnEnable () {
 	protected override void OnEnable () {
 		base.OnEnable();
 		base.OnEnable();
 		layerMixModes = serializedObject.FindProperty("layerMixModes");
 		layerMixModes = serializedObject.FindProperty("layerMixModes");
-		
-
-
 	}
 	}
 
 
 	protected override void gui () {
 	protected override void gui () {
 		base.gui();
 		base.gui();
 
 
-
 		EditorGUILayout.PropertyField(layerMixModes, true);
 		EditorGUILayout.PropertyField(layerMixModes, true);
 
 
 		serializedObject.ApplyModifiedProperties();
 		serializedObject.ApplyModifiedProperties();

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 56 - 10
spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs

@@ -89,20 +89,32 @@ public static class SkeletonBaker {
 
 
 		var skeletonData = skeletonDataAsset.GetSkeletonData(true);
 		var skeletonData = skeletonDataAsset.GetSkeletonData(true);
 		bool hasAnimations = bakeAnimations && skeletonData.Animations.Count > 0;
 		bool hasAnimations = bakeAnimations && skeletonData.Animations.Count > 0;
+#if UNITY_5
+		UnityEditor.Animations.AnimatorController controller = null;
+#else
 		UnityEditorInternal.AnimatorController controller = null;
 		UnityEditorInternal.AnimatorController controller = null;
-
+#endif
 		if (hasAnimations) {
 		if (hasAnimations) {
 			string controllerPath = outputPath + "/" + skeletonDataAsset.skeletonJSON.name + " Controller.controller";
 			string controllerPath = outputPath + "/" + skeletonDataAsset.skeletonJSON.name + " Controller.controller";
 			bool newAnimContainer = false;
 			bool newAnimContainer = false;
 
 
 			var runtimeController = AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController));
 			var runtimeController = AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController));
 
 
+#if UNITY_5
+			if (runtimeController != null) {
+				controller = (UnityEditor.Animations.AnimatorController)runtimeController;
+			} else {
+				controller = UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
+				newAnimContainer = true;
+			}
+#else
 			if (runtimeController != null) {
 			if (runtimeController != null) {
 				controller = (UnityEditorInternal.AnimatorController)runtimeController;
 				controller = (UnityEditorInternal.AnimatorController)runtimeController;
 			} else {
 			} else {
 				controller = UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
 				controller = UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
 				newAnimContainer = true;
 				newAnimContainer = true;
 			}
 			}
+#endif
 
 
 			Dictionary<string, AnimationClip> existingClipTable = new Dictionary<string, AnimationClip>();
 			Dictionary<string, AnimationClip> existingClipTable = new Dictionary<string, AnimationClip>();
 			List<string> unusedClipNames = new List<string>();
 			List<string> unusedClipNames = new List<string>();
@@ -147,7 +159,12 @@ public static class SkeletonBaker {
 					unusedClipNames.Remove(clip.name);
 					unusedClipNames.Remove(clip.name);
 				} else {
 				} else {
 					AssetDatabase.AddObjectToAsset(clip, controller);
 					AssetDatabase.AddObjectToAsset(clip, controller);
-					AnimatorController.AddAnimationClipToController(controller, clip);
+#if UNITY_5_0
+					controller.AddMotion(clip);
+#else
+					UnityEditorInternal.AnimatorController.AddAnimationClipToController(controller, clip);
+#endif
+
 				}
 				}
 			}
 			}
 
 
@@ -308,8 +325,8 @@ public static class SkeletonBaker {
 						attachmentTransform.gameObject.AddComponent<MeshRenderer>();
 						attachmentTransform.gameObject.AddComponent<MeshRenderer>();
 					}
 					}
 
 
-					attachmentTransform.renderer.sharedMaterial = material;
-					attachmentTransform.renderer.sortingOrder = i;
+					attachmentTransform.GetComponent<Renderer>().sharedMaterial = material;
+					attachmentTransform.GetComponent<Renderer>().sortingOrder = i;
 
 
 					if (attachmentName != slotData.AttachmentName)
 					if (attachmentName != slotData.AttachmentName)
 						attachmentTransform.gameObject.SetActive(false);
 						attachmentTransform.gameObject.SetActive(false);
@@ -365,23 +382,40 @@ public static class SkeletonBaker {
 		string controllerPath = dataPath.Replace("_SkeletonData", "_Controller").Replace(".asset", ".controller");
 		string controllerPath = dataPath.Replace("_SkeletonData", "_Controller").Replace(".asset", ".controller");
 
 
 
 
-
-		AnimatorController controller;
+#if UNITY_5
+		UnityEditor.Animations.AnimatorController controller;
 
 
 		if (skeletonDataAsset.controller != null) {
 		if (skeletonDataAsset.controller != null) {
-			controller = (AnimatorController)skeletonDataAsset.controller;
+			controller = (UnityEditor.Animations.AnimatorController)skeletonDataAsset.controller;
 		} else {
 		} else {
 			if (File.Exists(controllerPath)) {
 			if (File.Exists(controllerPath)) {
 				if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {
 				if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {
-					controller = (AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController));
+					controller = (UnityEditor.Animations.AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController));
 				} else {
 				} else {
-					controller = (AnimatorController)AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
+					controller = (UnityEditor.Animations.AnimatorController)UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
 				}
 				}
 			} else {
 			} else {
-				controller = (AnimatorController)AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
+				controller = (UnityEditor.Animations.AnimatorController)UnityEditor.Animations.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
 			}
 			}
 			
 			
 		}
 		}
+#else
+		UnityEditorInternal.AnimatorController controller;
+
+		if (skeletonDataAsset.controller != null) {
+			controller = (UnityEditorInternal.AnimatorController)skeletonDataAsset.controller;
+		} else {
+			if (File.Exists(controllerPath)) {
+				if (EditorUtility.DisplayDialog("Controller Overwrite Warning", "Unknown Controller already exists at: " + controllerPath, "Update", "Overwrite")) {
+					controller = (UnityEditorInternal.AnimatorController)AssetDatabase.LoadAssetAtPath(controllerPath, typeof(RuntimeAnimatorController));
+				} else {
+					controller = (UnityEditorInternal.AnimatorController)UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
+				}
+			} else {
+				controller = (UnityEditorInternal.AnimatorController)UnityEditorInternal.AnimatorController.CreateAnimatorControllerAtPath(controllerPath);
+			}
+		}
+#endif
 
 
 		skeletonDataAsset.controller = controller;
 		skeletonDataAsset.controller = controller;
 		EditorUtility.SetDirty(skeletonDataAsset);
 		EditorUtility.SetDirty(skeletonDataAsset);
@@ -405,7 +439,11 @@ public static class SkeletonBaker {
 				//generate new dummy clip
 				//generate new dummy clip
 				AnimationClip newClip = new AnimationClip();
 				AnimationClip newClip = new AnimationClip();
 				newClip.name = name;
 				newClip.name = name;
+#if UNITY_5
+#else
 				AnimationUtility.SetAnimationType(newClip, ModelImporterAnimationType.Generic);
 				AnimationUtility.SetAnimationType(newClip, ModelImporterAnimationType.Generic);
+#endif
+
 				AssetDatabase.AddObjectToAsset(newClip, controller);
 				AssetDatabase.AddObjectToAsset(newClip, controller);
 				clipTable.Add(name, newClip);
 				clipTable.Add(name, newClip);
 			}
 			}
@@ -735,10 +773,14 @@ public static class SkeletonBaker {
 	}
 	}
 
 
 	static void SetAnimationSettings (AnimationClip clip, AnimationClipSettings settings) {
 	static void SetAnimationSettings (AnimationClip clip, AnimationClipSettings settings) {
+#if UNITY_5
+		AnimationUtility.SetAnimationClipSettings(clip, settings);
+#else
 		MethodInfo methodInfo = typeof(AnimationUtility).GetMethod("SetAnimationClipSettings", BindingFlags.Static | BindingFlags.NonPublic);
 		MethodInfo methodInfo = typeof(AnimationUtility).GetMethod("SetAnimationClipSettings", BindingFlags.Static | BindingFlags.NonPublic);
 		methodInfo.Invoke(null, new object[] { clip, settings });
 		methodInfo.Invoke(null, new object[] { clip, settings });
 
 
 		EditorUtility.SetDirty(clip);
 		EditorUtility.SetDirty(clip);
+#endif
 	}
 	}
 
 
 	static AnimationClip ExtractAnimation (string name, SkeletonData skeletonData, Dictionary<int, List<string>> slotLookup, bool bakeIK, SendMessageOptions eventOptions, AnimationClip clip = null) {
 	static AnimationClip ExtractAnimation (string name, SkeletonData skeletonData, Dictionary<int, List<string>> slotLookup, bool bakeIK, SendMessageOptions eventOptions, AnimationClip clip = null) {
@@ -753,7 +795,11 @@ public static class SkeletonBaker {
 			AnimationUtility.SetAnimationEvents(clip, new AnimationEvent[0]);
 			AnimationUtility.SetAnimationEvents(clip, new AnimationEvent[0]);
 		}
 		}
 
 
+#if UNITY_5
+
+#else
 		AnimationUtility.SetAnimationType(clip, ModelImporterAnimationType.Generic);
 		AnimationUtility.SetAnimationType(clip, ModelImporterAnimationType.Generic);
+#endif
 
 
 		clip.name = name;
 		clip.name = name;
 
 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SkeletonBaker.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 5
spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs

@@ -528,7 +528,7 @@ public class SkeletonDataAssetInspector : Editor {
 		if (this.m_previewUtility == null) {
 		if (this.m_previewUtility == null) {
 			this.m_lastTime = Time.realtimeSinceStartup;
 			this.m_lastTime = Time.realtimeSinceStartup;
 			this.m_previewUtility = new PreviewRenderUtility(true);
 			this.m_previewUtility = new PreviewRenderUtility(true);
-			this.m_previewUtility.m_Camera.isOrthoGraphic = true;
+			this.m_previewUtility.m_Camera.orthographic = true;
 			this.m_previewUtility.m_Camera.orthographicSize = 1;
 			this.m_previewUtility.m_Camera.orthographicSize = 1;
 			this.m_previewUtility.m_Camera.cullingMask = -2147483648;
 			this.m_previewUtility.m_Camera.cullingMask = -2147483648;
 			this.m_previewUtility.m_Camera.nearClipPlane = 0.01f;
 			this.m_previewUtility.m_Camera.nearClipPlane = 0.01f;
@@ -554,7 +554,7 @@ public class SkeletonDataAssetInspector : Editor {
 
 
 				m_skeletonData = m_skeletonAnimation.skeletonDataAsset.GetSkeletonData(true);
 				m_skeletonData = m_skeletonAnimation.skeletonDataAsset.GetSkeletonData(true);
 
 
-				m_previewInstance.renderer.enabled = false;
+				m_previewInstance.GetComponent<Renderer>().enabled = false;
 
 
 				m_initialized = true;
 				m_initialized = true;
 				AdjustCameraGoals(true);
 				AdjustCameraGoals(true);
@@ -624,7 +624,7 @@ public class SkeletonDataAssetInspector : Editor {
 
 
 		GameObject go = this.m_previewInstance;
 		GameObject go = this.m_previewInstance;
 
 
-		Bounds bounds = go.renderer.bounds;
+		Bounds bounds = go.GetComponent<Renderer>().bounds;
 		m_orthoGoal = bounds.size.y;
 		m_orthoGoal = bounds.size.y;
 
 
 		m_posGoal = bounds.center + new Vector3(0, 0, -10);
 		m_posGoal = bounds.center + new Vector3(0, 0, -10);
@@ -661,7 +661,7 @@ public class SkeletonDataAssetInspector : Editor {
 		GameObject go = this.m_previewInstance;
 		GameObject go = this.m_previewInstance;
 
 
 		if (m_requireRefresh && go != null) {
 		if (m_requireRefresh && go != null) {
-			go.renderer.enabled = true;
+			go.GetComponent<Renderer>().enabled = true;
 
 
 			if (EditorApplication.isPlaying) {
 			if (EditorApplication.isPlaying) {
 				//do nothing
 				//do nothing
@@ -683,7 +683,7 @@ public class SkeletonDataAssetInspector : Editor {
 			}
 			}
 
 
 			this.m_previewUtility.m_Camera.Render();
 			this.m_previewUtility.m_Camera.Render();
-			go.renderer.enabled = false;
+			go.GetComponent<Renderer>().enabled = false;
 		}
 		}
 
 
 
 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Shaders/Bones.shader.meta

@@ -3,3 +3,5 @@ guid: 66988de88a15abd4e8846c6805485f57
 ShaderImporter:
 ShaderImporter:
   defaultTextures: []
   defaultTextures: []
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Shaders/HiddenPass.mat.meta

@@ -2,3 +2,5 @@ fileFormatVersion: 2
 guid: 43227e5adadc6f24bb4bf74b92a56fb4
 guid: 43227e5adadc6f24bb4bf74b92a56fb4
 NativeFormatImporter:
 NativeFormatImporter:
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Shaders/HiddenPass.shader.meta

@@ -3,3 +3,5 @@ guid: 913475501bf19374c84390868a9d6d3d
 ShaderImporter:
 ShaderImporter:
   defaultTextures: []
   defaultTextures: []
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Shaders/Skeleton.shader.meta

@@ -3,3 +3,5 @@ guid: 1e8a610c9e01c3648bac42585e5fc676
 ShaderImporter:
 ShaderImporter:
   defaultTextures: []
   defaultTextures: []
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/Shaders/SkeletonLit.shader.meta

@@ -3,3 +3,5 @@ guid: bd83c75f51f5e23498ae22ffcdfe92c3
 ShaderImporter:
 ShaderImporter:
   defaultTextures: []
   defaultTextures: []
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonAnimation.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonAnimationInterface.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 42 - 3
spine-unity/Assets/spine-unity/SkeletonAnimator.cs

@@ -1,4 +1,38 @@
-using UnityEngine;
+/******************************************************************************
+ * Spine Runtimes Software License
+ * Version 2.1
+ * 
+ * Copyright (c) 2013, Esoteric Software
+ * All rights reserved.
+ * 
+ * You are granted a perpetual, non-exclusive, non-sublicensable and
+ * non-transferable license to install, execute and perform the Spine Runtimes
+ * Software (the "Software") solely for internal use. Without the written
+ * permission of Esoteric Software (typically granted by licensing Spine), you
+ * may not (a) modify, translate, adapt or otherwise create derivative works,
+ * improvements of the Software or develop new applications using the Software
+ * or (b) remove, delete, alter or obscure any trademarks or any copyright,
+ * trademark, patent or other intellectual property or proprietary rights
+ * notices on or in the Software, including any copy thereof. Redistributions
+ * in binary or source form must include this license and terms.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL ESOTERIC SOFTARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * SkeletonAnimator created by Mitch Thompson
+ * Full irrevocable rights and permissions granted to Esoteric Software
+*****************************************************************************/
+using UnityEngine;
 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using Spine;
 using Spine;
@@ -69,10 +103,15 @@ public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation {
 				layerWeight = 1;
 				layerWeight = 1;
 
 
 			var stateInfo = animator.GetCurrentAnimatorStateInfo(i);
 			var stateInfo = animator.GetCurrentAnimatorStateInfo(i);
-			var clipInfo = animator.GetCurrentAnimationClipState(i);
 			var nextStateInfo = animator.GetNextAnimatorStateInfo(i);
 			var nextStateInfo = animator.GetNextAnimatorStateInfo(i);
-			var nextClipInfo = animator.GetNextAnimationClipState(i);
 
 
+#if UNITY_5
+			var clipInfo = animator.GetCurrentAnimatorClipInfo(i);
+			var nextClipInfo = animator.GetNextAnimatorClipInfo(i);
+#else
+			var clipInfo = animator.GetCurrentAnimationClipState(i);
+			var nextClipInfo = animator.GetNextAnimationClipState(i);
+#endif
 			MixMode mode = layerMixModes[i];
 			MixMode mode = layerMixModes[i];
 
 
 			if (mode == MixMode.AlwaysMix) {
 			if (mode == MixMode.AlwaysMix) {

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonAnimator.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonDataAsset.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonExtensions.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
spine-unity/Assets/spine-unity/SkeletonRenderer.cs

@@ -76,8 +76,8 @@ public class SkeletonRenderer : MonoBehaviour {
 	public virtual void Reset () {
 	public virtual void Reset () {
 		if (meshFilter != null)
 		if (meshFilter != null)
 			meshFilter.sharedMesh = null;
 			meshFilter.sharedMesh = null;
-		if (renderer != null)
-			renderer.sharedMaterial = null;
+		if (GetComponent<Renderer>() != null)
+			GetComponent<Renderer>().sharedMaterial = null;
 
 
 		if (mesh1 != null) {
 		if (mesh1 != null) {
 			if (Application.isPlaying)
 			if (Application.isPlaying)
@@ -225,7 +225,7 @@ public class SkeletonRenderer : MonoBehaviour {
 			submeshMaterials.CopyTo(sharedMaterials);
 			submeshMaterials.CopyTo(sharedMaterials);
 		else
 		else
 			sharedMaterials = submeshMaterials.ToArray();
 			sharedMaterials = submeshMaterials.ToArray();
-		renderer.sharedMaterials = sharedMaterials;
+		GetComponent<Renderer>().sharedMaterials = sharedMaterials;
 
 
 		// Ensure mesh data is the right size.
 		// Ensure mesh data is the right size.
 		Vector3[] vertices = this.vertices;
 		Vector3[] vertices = this.vertices;

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonRenderer.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs

@@ -246,7 +246,7 @@ public class SkeletonUtilityBoneInspector : Editor {
 	bool CanCreateHingeChain () {
 	bool CanCreateHingeChain () {
 		if (utilityBone == null)
 		if (utilityBone == null)
 			return false;
 			return false;
-		if (utilityBone.rigidbody != null)
+		if (utilityBone.GetComponent<Rigidbody>() != null)
 			return false;
 			return false;
 		if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0)
 		if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0)
 			return false;
 			return false;
@@ -266,7 +266,7 @@ public class SkeletonUtilityBoneInspector : Editor {
 			AttachRigidbody(utilBone);
 			AttachRigidbody(utilBone);
 		}
 		}
 
 
-		utilityBone.rigidbody.isKinematic = true;
+		utilityBone.GetComponent<Rigidbody>().isKinematic = true;
 
 
 		foreach (var utilBone in utilBoneArr) {
 		foreach (var utilBone in utilBoneArr) {
 			if (utilBone == utilityBone)
 			if (utilBone == utilityBone)
@@ -276,13 +276,13 @@ public class SkeletonUtilityBoneInspector : Editor {
 
 
 			HingeJoint joint = utilBone.gameObject.AddComponent<HingeJoint>();
 			HingeJoint joint = utilBone.gameObject.AddComponent<HingeJoint>();
 			joint.axis = Vector3.forward;
 			joint.axis = Vector3.forward;
-			joint.connectedBody = utilBone.transform.parent.rigidbody;
+			joint.connectedBody = utilBone.transform.parent.GetComponent<Rigidbody>();
 			joint.useLimits = true;
 			joint.useLimits = true;
 			JointLimits limits = new JointLimits();
 			JointLimits limits = new JointLimits();
 			limits.min = -20;
 			limits.min = -20;
 			limits.max = 20;
 			limits.max = 20;
 			joint.limits = limits;
 			joint.limits = limits;
-			utilBone.rigidbody.mass = utilBone.transform.parent.rigidbody.mass * 0.75f;
+			utilBone.GetComponent<Rigidbody>().mass = utilBone.transform.parent.GetComponent<Rigidbody>().mass * 0.75f;
 		}
 		}
 	}
 	}
 	
 	

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs

@@ -338,11 +338,11 @@ public class SkeletonUtility : MonoBehaviour {
 			SkeletonUtilitySubmeshRenderer s = go.AddComponent<SkeletonUtilitySubmeshRenderer>();
 			SkeletonUtilitySubmeshRenderer s = go.AddComponent<SkeletonUtilitySubmeshRenderer>();
 			s.sortingOrder = i * 10;
 			s.sortingOrder = i * 10;
 			s.submeshIndex = i;
 			s.submeshIndex = i;
-			s.Initialize(renderer);
+			s.Initialize(GetComponent<Renderer>());
 			s.Update();
 			s.Update();
 		}
 		}
 
 
 		if (disablePrimaryRenderer)
 		if (disablePrimaryRenderer)
-			renderer.enabled = false;
+			GetComponent<Renderer>().enabled = false;
 	}
 	}
 }
 }

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityConstraint.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityEyeConstraint.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityGroundConstraint.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs

@@ -57,7 +57,7 @@ public class SkeletonUtilityKinematicShadow : MonoBehaviour {
 				continue;
 				continue;
 
 
 			foreach (var sb in shadowBones) {
 			foreach (var sb in shadowBones) {
-				if (sb.rigidbody == null)
+				if (sb.GetComponent<Rigidbody>() == null)
 					continue;
 					continue;
 
 
 				if (sb.boneName == b.boneName) {
 				if (sb.boneName == b.boneName) {
@@ -72,8 +72,8 @@ public class SkeletonUtilityKinematicShadow : MonoBehaviour {
 	}
 	}
 
 
 	void FixedUpdate () {
 	void FixedUpdate () {
-		shadowRoot.rigidbody.MovePosition(transform.position);
-		shadowRoot.rigidbody.MoveRotation(transform.rotation);
+		shadowRoot.GetComponent<Rigidbody>().MovePosition(transform.position);
+		shadowRoot.GetComponent<Rigidbody>().MoveRotation(transform.rotation);
 
 
 		foreach (var pair in shadowTable) {
 		foreach (var pair in shadowTable) {
 			pair.Value.localPosition = pair.Key.localPosition;
 			pair.Value.localPosition = pair.Key.localPosition;

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilityKinematicShadow.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs

@@ -16,7 +16,7 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour {
 	MeshFilter parentFilter;
 	MeshFilter parentFilter;
 
 
 	void Awake () {
 	void Awake () {
-		cachedRenderer = renderer;
+		cachedRenderer = GetComponent<Renderer>();
 		sharedMaterials = cachedRenderer.sharedMaterials;
 		sharedMaterials = cachedRenderer.sharedMaterials;
 		filter = GetComponent<MeshFilter>();
 		filter = GetComponent<MeshFilter>();
 
 
@@ -53,13 +53,13 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour {
 		}
 		}
 
 
 		if (cachedRenderer == null)
 		if (cachedRenderer == null)
-			cachedRenderer = renderer;
+			cachedRenderer = GetComponent<Renderer>();
 
 
 		if (mesh == null || submeshIndex > mesh.subMeshCount - 1) {
 		if (mesh == null || submeshIndex > mesh.subMeshCount - 1) {
 			cachedRenderer.enabled = false;
 			cachedRenderer.enabled = false;
 			return;
 			return;
 		} else {
 		} else {
-			renderer.enabled = true;
+			GetComponent<Renderer>().enabled = true;
 		}
 		}
 
 
 		bool changed = false;
 		bool changed = false;
@@ -71,7 +71,7 @@ public class SkeletonUtilitySubmeshRenderer : MonoBehaviour {
 
 
 
 
 
 
-		for (int i = 0; i < renderer.sharedMaterials.Length; i++) {
+		for (int i = 0; i < GetComponent<Renderer>().sharedMaterials.Length; i++) {
 			if (i == submeshIndex)
 			if (i == submeshIndex)
 				continue;
 				continue;
 
 

+ 2 - 0
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtilitySubmeshRenderer.cs.meta

@@ -10,3 +10,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
spine-unity/Assets/spine-unity/SpineAttributes.cs.meta

@@ -6,3 +6,5 @@ MonoImporter:
   executionOrder: 0
   executionOrder: 0
   icon: {instanceID: 0}
   icon: {instanceID: 0}
   userData: 
   userData: 
+  assetBundleName: 
+  assetBundleVariant: