Merge branch 'master' into uistyler-patch1

Author: MerlinVR

Assets/USharpVideo/Examples/Scripts/PlayURLButton.cs

@@ -15,7 +15,7 @@ namespace UdonSharp.Video.Examples
     public class PlayURLButton : UdonSharpBehaviour
     {
         public USharpVideoPlayer targetVideoPlayer;
-        public VRCUrl url = VRCUrl.Empty;
+        public VRCUrl url = new VRCUrl("");
 
         Button button;
 

Assets/USharpVideo/Scripts/UI/UIStyler.cs

@@ -26,15 +26,15 @@ private void Reset()
             hideFlags = HideFlags.DontSaveInBuild;
         }
 
-        static Dictionary<UIStyleMarkup.StyleClass, FieldInfo> GetStyleFieldMap()
+        private static Dictionary<UIStyleMarkup.StyleClass, FieldInfo> GetStyleFieldMap()
         {
             Dictionary<UIStyleMarkup.StyleClass, FieldInfo> fieldLookup = new Dictionary<UIStyleMarkup.StyleClass, FieldInfo>();
 
             foreach (FieldInfo field in typeof(UIStyle).GetFields(BindingFlags.Public | BindingFlags.Instance))
             {
                 if (field.FieldType == typeof(Color))
                 {
-                    var markupAttr = field.GetCustomAttribute<StyleMarkupLinkAttribute>();
+                    StyleMarkupLinkAttribute markupAttr = field.GetCustomAttribute<StyleMarkupLinkAttribute>();
 
                     if (markupAttr != null)
                     {
@@ -47,7 +47,7 @@ private void Reset()
         }
 
 #if UNITY_EDITOR
-        Color GetColor(FieldInfo field)
+    private Color GetColor(FieldInfo field)
         {
             return (Color)field.GetValue(uiStyle);
         }
@@ -140,7 +140,7 @@ public void ApplyStyle()
             }
         }
 
-        void RecordObject(Component comp)
+        private static void RecordObject(Object comp)
         {
             if (PrefabUtility.IsPartOfPrefabInstance(comp))
                 PrefabUtility.RecordPrefabInstancePropertyModifications(comp);
@@ -152,7 +152,7 @@ void RecordObject(Component comp)
     [CustomEditor(typeof(UIStyler))]
     internal class UIStylerEditor : Editor
     {
-        SerializedProperty colorStyleProperty;
+        private SerializedProperty colorStyleProperty;
 
         private void OnEnable()
         {