Merge branch '3.6' into 3.7-beta

spine-ue4/SpineUE4.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.17",
+	"EngineAssociation": "4.18",
 	"Category": "",
 	"Description": "",
 	"Modules": [

spine-unity/Assets/Gizmos.meta

@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: a260a1ff5965c2c4f88aea3e7d433965
-folderAsset: yes
-DefaultImporter:
-  userData: 

spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity

@@ -267,7 +267,7 @@ MonoBehaviour:
   zSpacing: 0
   useClipping: 1
   immutableTriangles: 0
-  pmaVertexColors: 1
+  pmaVertexColors: 0
   clearStateOnDisable: 0
   tintBlack: 0
   singleSubmesh: 0
@@ -348,7 +348,7 @@ MonoBehaviour:
   audioClip: {fileID: 8300000, guid: e885484e1bc99fb47a0ac3f6bfa586b1, type: 3}
   basePitch: 0.5
   randomPitchOffset: 0.25
-  debugMessage: 0
+  logDebugMessage: 0
 --- !u!114 &1256911799
 MonoBehaviour:
   m_ObjectHideFlags: 0