Unity 2023.1.20f1 C# reference source code

Author: Unity Technologies

Editor/Mono/CustomInspectorStubs.cs

@@ -72,15 +72,12 @@ internal static SettingsProvider CreateProjectSettingsProvider()
             // as it will load *all* objects at that path and try to create an editor for it.
             // NOTE: When the input system package is uninstalled, InputManager.asset will contain serialized MonoBehaviour objects for which
             //       the C# classes are no longer available. They will thus not load correctly and appear as null entries.
-            var objects = AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/InputManager.asset");
-            foreach (var obj in objects)
+            var obj = AssetDatabase.LoadAssetAtPath<InputManager>("ProjectSettings/InputManager.asset");
+            if (obj != null && obj.name == "InputManager")
             {
-                if (obj != null && obj.name == "InputManager")
-                {
-                    var provider = AssetSettingsProvider.CreateProviderFromObject("Project/Input Manager", obj,
-                        SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
-                    return provider;
-                }
+                var provider = AssetSettingsProvider.CreateProviderFromObject("Project/Input Manager", obj,
+                    SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
+                return provider;
             }
             return null;
         }

Editor/Mono/EditorGUI.cs

@@ -3955,7 +3955,7 @@ public static int GetSelectedValueForControl(int controlID, int selected)
                     }
                     if (instance.m_ControlID == controlID)
                     {
-                        GUI.changed = selected != instance.m_SelectedIndex;
+                        GUI.changed = showMixedValue || selected != instance.m_SelectedIndex;
                         selected = instance.m_SelectedIndex;
                         instance = null;
                         evt.Use();

Editor/Mono/EditorTextSettings.cs

@@ -19,6 +19,7 @@ internal class EditorTextSettings : TextSettings
     {
         private static EditorTextSettings s_DefaultTextSettings;
         private static float s_CurrentEditorSharpness;
+        private static bool s_CurrentEditorSharpnessLoadedOrSet = false;
 
         const string k_Platform =
                             " - Linux";
@@ -31,10 +32,15 @@ static EditorTextSettings()
         internal static void SetCurrentEditorSharpness(float sharpness)
         {
             s_CurrentEditorSharpness = sharpness;
+            s_CurrentEditorSharpnessLoadedOrSet = true;
         }
 
         internal override float GetEditorTextSharpness()
         {
+            if (!s_CurrentEditorSharpnessLoadedOrSet)
+            {
+                SetCurrentEditorSharpness(EditorPrefs.GetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", 0.0f));
+            }
             return s_CurrentEditorSharpness;
         }
 

Editor/Mono/GUI/MaskFieldGUI.cs

@@ -33,6 +33,12 @@ private class MaskCallbackInfo
             // Which view should we send it to.
             private readonly GUIView m_SourceView;
 
+            // Current drop-down reference 
+            public MaskFieldDropDown m_DropDown;
+
+            // validation flag for masks that are changed externally
+            private bool m_Validate = false;
+
             public MaskCallbackInfo(int controlID)
             {
                 m_ControlID = controlID;
@@ -77,6 +83,31 @@ internal void SetMaskValueDelegate(object userData, string[] options, int select
                 if (m_SourceView)
                     m_SourceView.SendEvent(EditorGUIUtility.CommandEvent(kMaskMenuChangedMessage));
             }
+
+            public void UpdateFlagChanges(int mask, int[] optionMaskValues)
+            {
+                var evt = Event.current;
+
+                if (evt.type == EventType.ExecuteCommand)
+                {
+                    m_Validate = true;
+                }
+                // This code  is responsible for verifying whether the incoming mask value differs from the one that is currently selected in the dropdown menu.
+                // When these values do not match, it serves as confirmation that the incoming value has been modified.
+                // Subsequently, we proceed to update the dropdown menu to reflect these changes.
+                else if (evt.type == EventType.Repaint && m_Validate)
+                {
+                    if (m_DropDown == null)
+                    {
+                        return;
+                    }
+
+                    if (mask != m_NewMask)
+                        m_DropDown.UpdateMaskValues(mask, optionMaskValues);
+
+                    m_Validate = false;
+                }
+            }
         }
 
         /// Make a field for a generic mask.
@@ -117,6 +148,10 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
 
             GetMenuOptions(mask, flagNames, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out _, enumType);
 
+            // This checks and update flags changes that are modified out of dropdown menu
+            if (MaskCallbackInfo.m_Instance != null)
+                MaskCallbackInfo.m_Instance.UpdateFlagChanges(mask, optionMaskValues);
+
             Event evt = Event.current;
             if (evt.type == EventType.Repaint)
             {
@@ -126,7 +161,8 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
             else if ((evt.type == EventType.MouseDown && position.Contains(evt.mousePosition)) || evt.MainActionKeyForControl(controlID))
             {
                 MaskCallbackInfo.m_Instance = new MaskCallbackInfo(controlID);
-                PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate));
+                MaskCallbackInfo.m_Instance.m_DropDown = new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate);
+                PopupWindowWithoutFocus.Show(position, MaskCallbackInfo.m_Instance.m_DropDown);
             }
 
             return mask;

Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs

@@ -97,14 +97,21 @@ protected override bool OnApplyRevertGUI()
         {
             bool applied = base.OnApplyRevertGUI();
 
+            bool hasModified = HasModified();
+            if (tabs == null) // Hitting apply, we lose the tabs object within base.OnApplyRevertGUI()
+            {
+                if(hasModified)
+                    Apply();
+                return applied;
+            }
+
             bool doMatsHaveDifferentShaders = (tabs[0] as SpeedTreeImporterModelEditor).doMaterialsHaveDifferentShader;
 
             if (HasRemappedMaterials() || doMatsHaveDifferentShaders)
             {
                 // Force material upgrade when a custom render pipeline is active so that render pipeline-specific material
                 // modifications may be applied.
                 bool upgrade = upgradeMaterials || (UnityEngine.Rendering.GraphicsSettings.currentRenderPipeline != null);
-                bool hasModified = HasModified();
                 if (GUILayout.Button(GetGenButtonText(hasModified, upgrade)))
                 {
                     // Apply the changes and generate the materials before importing so that asset previews are up-to-date.

Editor/Mono/Inspector/Editor.cs

@@ -1364,8 +1364,7 @@ internal bool CanBeExpandedViaAFoldout()
 
             if (m_SerializedObject == null)
             {
-                m_SerializedObject = new SerializedObject(targets, m_Context);
-                m_SerializedObject.inspectorMode = m_InspectorMode;
+                CreateSerializedObject();
             }
             else
                 m_SerializedObject.Update();
@@ -1383,8 +1382,7 @@ internal bool CanBeExpandedViaAFoldoutWithoutUpdate()
 
             if (m_SerializedObject == null)
             {
-                m_SerializedObject = new SerializedObject(targets, m_Context);
-                m_SerializedObject.inspectorMode = m_InspectorMode;
+                CreateSerializedObject();
             }
             SerializedProperty property = m_SerializedObject.GetIterator();
 

Editor/Mono/Inspector/MaskFieldDropdown.cs

@@ -87,6 +87,12 @@ public MaskFieldDropDown(string[] optionNames, int[] flagValues, int[] optionMas
                     m_AllLayersMask |= val;
         }
 
+        public void UpdateMaskValues(int mask, int[] optionMaskValues)
+        {
+            m_OptionMaskValues = (int[])optionMaskValues.Clone();
+            m_SelectionMaskValues = new int[] { mask };
+        }
+
         public override Vector2 GetWindowSize()
         {
             var rowCount = m_OptionNames[0] == "Nothing" ? m_OptionNames.Length : m_OptionNames.Length + 2;
@@ -127,7 +133,9 @@ void DrawGUIForArrays()
                 bool toggleVal = (m_SelectionMaskValues[0] & m_OptionMaskValues[i]) == m_OptionMaskValues[i];
                 if ((m_SelectionMaskValues[0] != 0 && i == 0) || m_SelectionMaskValues[0] != -1 && i == 1)
                     toggleVal = false;
-                
+
+               if((m_SelectionMaskValues[0] == m_AllLayersMask) && i == 1)
+                    toggleVal = true;
 
                 var guiRect = EditorGUILayout.GetControlRect(false, EditorGUI.kSingleLineHeight);
                 guiRect.width = GetWindowSize().x;

Editor/Mono/Inspector/MaterialEditor.cs

@@ -3080,6 +3080,7 @@ internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
             menu.AddItem(new GUIContent("Create Variant for Renderer"), false, () => {
 
                 var directory = "Assets/Materials";
+                Directory.CreateDirectory(directory);
                 var assetPath = AssetDatabase.GetAssetPath(material);
                 var assetName = Path.GetFileNameWithoutExtension(assetPath) + " Variant";
                 var package = PackageManager.PackageInfo.FindForAssetPath(assetPath);
@@ -3088,7 +3089,6 @@ internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
 
                 var path = AssetDatabase.GenerateUniqueAssetPath(Path.Combine(directory, assetName + ".mat"));
                 var variant = new Material(material) { name = assetName, parent = material };
-                Directory.CreateDirectory(directory);
                 AssetDatabase.CreateAsset(variant, path);
 
                 foreach (var renderer in renderers)

Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs

@@ -1113,7 +1113,6 @@ private void WritePreferences()
             EditorPrefs.SetBool("Editor.kEnableCompilerMessagesLocalization", m_EnableCompilerMessagesLocalization);
 
             EditorPrefs.SetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", m_EditorTextSharpness);
-            EditorTextSettings.SetCurrentEditorSharpness(m_EditorTextSharpness);
             EditorApplication.RequestRepaintAllTexts();
 
             EditorPrefs.SetBool("AllowAlphaNumericHierarchy", m_AllowAlphaNumericHierarchy);
@@ -1205,6 +1204,8 @@ private void ReadPreferences()
             m_SelectedLanguage = EditorPrefs.GetString("Editor.kEditorLocale", LocalizationDatabase.GetDefaultEditorLanguage().ToString());
             m_EnableCompilerMessagesLocalization = EditorPrefs.GetBool("Editor.kEnableCompilerMessagesLocalization", false);
             m_EditorTextSharpness = EditorPrefs.GetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", 0.0f);
+            EditorTextSettings.SetCurrentEditorSharpness(m_EditorTextSharpness);
+
             m_AllowAlphaNumericHierarchy = EditorPrefs.GetBool("AllowAlphaNumericHierarchy", false);
             m_DefaultPrefabModeFromHierarchy = GetDefaultPrefabModeForHierarchy();
             m_ProgressDialogDelay = EditorPrefs.GetFloat("EditorBusyProgressDialogDelay", 3.0f);

Editor/Mono/UIElements/Controls/ColorField.cs

@@ -9,7 +9,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Makes a field for selecting a color.
+    /// Makes a field for selecting a color. For more information, refer to [[wiki:UIE-uxml-element-ColorField|UXML element ColorField]].
     /// </summary>
     public class ColorField : BaseField<Color>
     {