Adding Welcome Page. Moved shaders

Author: Jaimi

.gitignore

@@ -53,3 +53,4 @@ UMAProject/Assets/Assets
 UMAProject/Assets/Plugins
 UMAProject/Assets/Tarfmagougou.meta
 /UMAProject/Assets/Tarfmagougou
+*.docx

UMAProject/Assets/UMA/Content/Contrib/Male_ShavedHead/Cap_Rash_Overlay.asset

@@ -13,8 +13,10 @@ MonoBehaviour:
   m_Name: UMA_Hair_Aniso
   m_EditorClassIdentifier: 
   translateSRP: 1
+  AutoSetSRPMaterials: 1
   _material: {fileID: 2100000, guid: f4d3c2e2816d3dd4db44df0ff7085cae, type: 2}
-  _secondPass: {fileID: 0}
+  _secondPass: {fileID: -4288583467269203127, guid: f518b34f64e6ae24486b693967c5cd25,
+    type: 3}
   srpMaterials:
   - SRP: 2
     material: {fileID: 2100000, guid: 836ba1c96b1a93a4c8e7ff58ffb68a11, type: 2}
@@ -28,17 +30,17 @@ MonoBehaviour:
     alternateKeywords:
     - _BaseMap
     - _BumpMap
-  materialType: 1
+  materialType: 8
   channels:
-  - channelType: 0
+  - channelType: 3
     textureFormat: 0
     materialPropertyName: _MainTex
     sourceTextureName: 
     Compression: 0
     DownSample: 0
     ConvertRenderTexture: 0
     NonShaderTexture: 0
-  - channelType: 1
+  - channelType: 3
     textureFormat: 0
     materialPropertyName: _BumpMap
     sourceTextureName: 

UMAProject/Assets/UMA/Content/Core/HumanMale/Recipes/BaseRecipes/HumanMale Base Recipe.asset

@@ -1220,9 +1220,10 @@ void GenerateSingleUMA(bool rebuild = false)
                 return;
             }
 
-            UMAGenerator ugb = UMAContext.Instance.gameObject.GetComponentInChildren<UMAGenerator>();
+            UMAGenerator ugb = UMAContext.Instance.gameObject.GetComponentInChildren<UMAGenerator>(true);
             if (ugb == null)
             {
+                Debug.Log("Cannot find generator!");
                 EditorUtility.DisplayDialog("Error", "Cannot find generator!", "OK");
             }
             else

UMAProject/Assets/UMA/Content/Core/HumanMale/Slots/Body/MidPoly/UMA_Human_Male_Head_Mid_Slot.asset

@@ -204,13 +204,14 @@ private void SetupMenus()
             // ***********************************************************************************
             AddMenuItemWithCallback(FileMenu, "Rebuild From Project", () =>
             {
-                UAI.SaveKeeps();
+                UAI.RebuildLibrary();
+                /*UAI.SaveKeeps();
                 UAI.Clear();
                 UAI.BuildStringTypes();
                 UAI.AddEverything(false);
                 UAI.RestoreKeeps();
                 UAI.ForceSave();
-                Resources.UnloadUnusedAssets();
+                Resources.UnloadUnusedAssets(); */
                 m_Initialized = false;
                 Repaint();
             });
@@ -2285,13 +2286,13 @@ private void DragDropType(Rect dropArea)
 
         void OnGUI()
         {
-            if (EditorApplication.isCompiling)
+            if (EditorApplication.isCompiling || EditorApplication.isUpdating)
             {
                 dots += ".";
                 if (dots.Length > 20)
                     dots = "";
                 GUILayout.Space(30);
-                EditorGUILayout.LabelField("    Compile in progress  " + dots);
+                EditorGUILayout.LabelField("    Compile/update in progress  " + dots);
                 System.Threading.Thread.Sleep(100);
                 Repaint();
                 return;

UMAProject/Assets/UMA/Content/Core/HumanShared/Materials/Other/UMA_Hair_Aniso.asset

@@ -1691,7 +1691,7 @@ public bool OnGUI(ref bool _dnaDirty, ref bool _textureDirty, ref bool _meshDirt
                         changed = true;
                     }
 
-                    int remapUV = EditorGUILayout.Popup("Remap UV to Main", _slotData.UVSet, new string[] { "None", "UV Set 1", "UV Set 2", "UV Set 3" });
+                    int remapUV = EditorGUILayout.Popup("Remap UV to Main", _slotData.UVSet, new string[] { "None", "UV Set 2", "UV Set 3", "UV Set 4" });
                     if (remapUV != _slotData.UVSet)
                     {
                         _slotData.UVSet = remapUV;

UMAProject/Assets/UMA/Content/Core/HumanShared/Overlays/Hair/MeshHairAniso.asset

@@ -4,6 +4,7 @@
 using UnityEngine.Events;
 using System.IO;
 using System.Collections.Generic;
+using UnityEditor.AddressableAssets.Build.BuildPipelineTasks;
 
 namespace UMA.Editors
 {
@@ -130,6 +131,31 @@ public static void EndVerticalPadded()
 		{
 			GUIHelper.EndVerticalPadded(10);
 		}
+        public static Rect ShrinkRect(Rect rect, float inset, float xinset = -1)
+        {
+            if (xinset < 0)
+            {
+                xinset = inset;
+            }
+            return new Rect(rect.x + xinset, rect.y + inset, rect.width - xinset * 2, rect.height - inset * 2);
+        }
+
+        public static void BeginInsetArea(Color backgroundColor, Rect rect, float inset, float vertpadding, float xinset = -1)
+        {
+            if (xinset < 0)
+            {
+                xinset = inset;
+            }
+            EditorGUI.DrawRect(ShrinkRect(rect, inset, xinset), backgroundColor);
+            GUILayout.BeginArea(ShrinkRect(rect, inset*2, xinset));
+            GUILayout.Space(vertpadding);
+        }
+
+
+        public static void EndInsetArea()
+        {
+            GUILayout.EndArea();
+        }
 
 		public static void BeginVerticalPadded(float padding, Color backgroundColor, GUIStyle theStyle = null)
 		{