Tidy up post merge

--HG--
branch : develop_5.2

Scripts/Effects/ImageExtended.cs

@@ -253,8 +253,14 @@ namespace UnityEngine.UI.Extensions
         /// Update the UI renderer mesh.
         /// </summary>
 
-        protected override void OnFillVBO(List<UIVertex> vbo)
+        protected override void OnPopulateMesh(Mesh toFill)
         {
+            List<UIVertex> vbo = new List<UIVertex>();
+            using (var helper = new VertexHelper(toFill))
+            {
+                helper.GetUIVertexStream(vbo);
+            }
+
             switch (type)
             {
                 case Type.Simple:
@@ -270,6 +276,12 @@ namespace UnityEngine.UI.Extensions
                     GenerateFilledSprite(vbo, m_PreserveAspect);
                     break;
             }
+
+            using (var helper = new VertexHelper())
+            {
+                helper.AddUIVertexTriangleStream(vbo);
+                helper.FillMesh(toFill);
+            }
         }
 
         #region Various fill functions

Scripts/ToolTips/BoundTooltip/BoundTooltipTrigger.cs

@@ -1,6 +1,5 @@
 ///Credit Martin Nerurkar // www.martin.nerurkar.de // www.sharkbombs.com
 ///Sourced from - http://www.sharkbombs.com/2015/02/10/tooltips-with-the-new-unity-ui-ugui/
-
 using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
@@ -8,20 +7,35 @@ namespace UnityEngine.UI.Extensions
 	[AddComponentMenu("UI/Extensions/Bound Tooltip/Tooltip Trigger")]
 	public class BoundTooltipTrigger : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, ISelectHandler, IDeselectHandler
 	{
+		[TextAreaAttribute]
 		public string text;
 
+		public bool useMousePosition = false;
+
+		public Vector3 offset;
+
 		public void OnPointerEnter(PointerEventData eventData)
+		{
+			if (useMousePosition)
 			{
 				StartHover(new Vector3(eventData.position.x, eventData.position.y, 0f));
 			}
+			else
+			{
+				StartHover(transform.position + offset);
+			}
+		}
+
 		public void OnSelect(BaseEventData eventData)
 		{
 			StartHover(transform.position);
 		}
+
 		public void OnPointerExit(PointerEventData eventData)
 		{
 			StopHover();
 		}
+
 		public void OnDeselect(BaseEventData eventData)
 		{
 			StopHover();
@@ -31,6 +45,7 @@ namespace UnityEngine.UI.Extensions
 		{
 			BoundTooltipItem.Instance.ShowTooltip(text, position);
 		}
+
 		void StopHover()
 		{
 			BoundTooltipItem.Instance.HideTooltip();

Scripts/Utilities/UISelectableExtension.cs

@@ -2,6 +2,7 @@
 /// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-1796783
 /// Extended to include a HELD state that continually fires while the button is held down.
 /// Refactored so it can be added to any button and expose the events in the editor.
+/// Unselect fix by @Sfyne
 
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -108,5 +109,11 @@ namespace UnityEngine.UI.Extensions
                 Debug.Log("Control Held");
             #endif
         }
+
+        //Fixed UISelectableExtension inactive bug (if gameObject becomes inactive while button is held down it never goes back to _pressed = false)
+        void OnDisable () 
+        {
+            _pressed = false;
+        }
     }
 }