Unity 6000.0.50f1 C# reference source code

Author: Unity Technologies

Editor/Mono/AttributeHelper.cs

@@ -112,7 +112,7 @@ static MonoGizmoMethod[] ExtractGizmos(Assembly assembly)
  }
 
  [RequiredByNativeCode]
- static string GetComponentMenuName(Type type)
+ static object GetComponentMenuName(Type type)
  {
  var attrs = type.GetCustomAttributes(typeof(AddComponentMenu), false);
  if (attrs.Length > 0)

Editor/Mono/EditorApplication.bindings.cs

@@ -21,6 +21,7 @@ namespace UnityEditor
  [NativeHeader("Runtime/Input/TimeManager.h")]
  [NativeHeader("Editor/Src/ProjectVersion.h")]
  [NativeHeader("Runtime/Misc/BuildSettings.h")]
+ [NativeHeader("Runtime/Interfaces/ILicensing.h")]
  [StaticAccessor("EditorApplicationBindings", StaticAccessorType.DoubleColon)]
  public sealed partial class EditorApplication
  {
@@ -139,7 +140,7 @@ public static ScriptingRuntimeVersion scriptingRuntimeVersion
  get { return ScriptingRuntimeVersion.Latest; }
  }
 
- [StaticAccessor("GetApplication()", StaticAccessorType.Dot)]
+ [StaticAccessor("GetILicensing()", StaticAccessorType.Arrow)]
  internal static extern string GetLicenseType();
 
  // Prevents loading of assemblies when it is inconvenient.

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -210,7 +210,7 @@ class SettingsContent
  public static readonly GUIContent managedStrippingLevel = EditorGUIUtility.TrTextContent("Managed Stripping Level", "If scripting backend is IL2CPP, managed stripping can't be disabled.");
  public static readonly GUIContent il2cppCompilerConfiguration = EditorGUIUtility.TrTextContent("C++ Compiler Configuration");
  public static readonly GUIContent il2cppCodeGeneration = EditorGUIUtility.TrTextContent("IL2CPP Code Generation", "Determines whether IL2CPP should generate code optimized for runtime performance or build size/iteration.");
- public static readonly GUIContent[] il2cppCodeGenerationNames = new GUIContent[] { EditorGUIUtility.TrTextContent("Faster runtime"), EditorGUIUtility.TrTextContent("Faster (smaller) builds") };
+ public static readonly GUIContent[] il2cppCodeGenerationNames = new GUIContent[] { EditorGUIUtility.TrTextContent("Optimize for runtime speed"), EditorGUIUtility.TrTextContent("Optimize for code size and build time") };
  public static readonly GUIContent il2cppStacktraceInformation = EditorGUIUtility.TrTextContent("IL2CPP Stacktrace Information", "Which information to include in stack traces. Including the file name and line number may increase build size.");
  public static readonly GUIContent scriptingMono2x = EditorGUIUtility.TrTextContent("Mono");
  public static readonly GUIContent scriptingIL2CPP = EditorGUIUtility.TrTextContent("IL2CPP");
@@ -1030,7 +1030,7 @@ private bool HasReasonToCompile()
 
  private bool SupportsRunInBackground(NamedBuildTarget buildTarget)
  {
- return buildTarget == NamedBuildTarget.Standalone;
+ return buildTarget == NamedBuildTarget.Standalone || buildTarget == NamedBuildTarget.VisionOS;
  }
 
  private void OnPresetSelectorClosed()
@@ -2095,10 +2095,12 @@ private void OtherSectionShaderSettingsGUI(BuildPlatform platform)
  SettingsContent.shaderPrecisionModelOptions);
  if (EditorGUI.EndChangeCheck() && currShaderPrecisionModel != newShaderPrecisionModel)
  {
- m_ShaderPrecisionModel.intValue = (int) newShaderPrecisionModel;
+ m_ShaderPrecisionModel.intValue = (int)newShaderPrecisionModel;
  serializedObject.ApplyModifiedProperties();
  if (IsActivePlayerSettingsEditor())
- PlayerSettings.SyncShaderPrecisionModel();
+ {
+ EditorApplication.delayCall += () => PlayerSettings.SyncShaderPrecisionModel();
+ }
  }
  }
 

Editor/Mono/Inspector/UnityEventDrawer.cs

@@ -369,6 +369,23 @@ static PersistentListenerMode GetMode(SerializedProperty mode)
  return (PersistentListenerMode)mode.enumValueIndex;
  }
 
+ internal static bool ShouldClearMethodAfterTargetChanged(SerializedProperty listener, Object newValue)
+ {
+ // If the type is the same we dont need to clear the method
+ var typeProperty = listener.FindPropertyRelative(kInstanceTypePath);
+ var typeString = typeProperty.stringValue;
+ if (!string.IsNullOrEmpty(typeString))
+ {
+ var objType = Type.GetType(typeString, false);
+
+ if (objType == null || newValue == null || newValue.GetType() != objType)
+ return true;
+ }
+
+ // Clear if the value is null
+ return newValue == null;
+ }
+
  protected virtual void DrawEvent(Rect rect, int index, bool isActive, bool isFocused)
  {
  var pListener = m_ListenersArray.GetArrayElementAtIndex(index);
@@ -396,8 +413,10 @@ protected virtual void DrawEvent(Rect rect, int index, bool isActive, bool isFoc
  {
  GUI.Box(goRect, GUIContent.none);
  EditorGUI.PropertyField(goRect, listenerTarget, GUIContent.none);
- if (EditorGUI.EndChangeCheck())
+ if (EditorGUI.EndChangeCheck() && ShouldClearMethodAfterTargetChanged(pListener, listenerTarget.objectReferenceValue))
+ {
  methodName.stringValue = null;
+ }
  }
 
  SerializedProperty argument = GetArgument(pListener);

Editor/Mono/UIElements/DefaultMainToolbar.cs

@@ -20,6 +20,7 @@ static IEnumerable<string> leftToolbar
  yield return "Services/Version Control";
  //Modules/EditorToolbar/ToolbarElements/*.cs
  yield return "Editor Utility/Store";
+ yield return "Package Management/Package Manager";
  //Editor/Mono/GUI/Toolbars/MainToolbarImguiContainer.cs
  yield return "Editor Utility/Imgui Subtoolbars";
  }
@@ -42,7 +43,6 @@ static IEnumerable<string> rightToolbar
  yield return "Editor Utility/Layout";
  yield return "Editor Utility/Search";
  yield return "Editor Utility/Modes";
- yield return "Package Manager/PreviewPackagesInUse";
  yield return "Editor Utility/Undo";
  // Modules/Multiplayer/MultiplayerRoleDropdown.cs
  yield return "Multiplayer/MultiplayerRole";

Editor/Mono/UIElements/Drawers/Internal/UnityEventItem.cs

@@ -113,14 +113,10 @@ public UnityEventItem()
  leftColumn.Add(listenerTarget);
  listenerTarget.RegisterCallback<ChangeEvent<UnityEngine.Object>>((e) =>
  {
- var isTargetValid = e.newValue != null;
-
- if (!isTargetValid)
- {
+ if (UnityEventDrawer.ShouldClearMethodAfterTargetChanged(m_PropertyData.listener, e.newValue))
  functionDropdown.value = null;
- }
 
- functionDropdown.SetEnabled(isTargetValid);
+ functionDropdown.SetEnabled(e.newValue != null);
 
  UpdateParameterField();
  });

Modules/AssetPipelineEditor/ImportSettings/PluginImporterInspector.cs

@@ -96,8 +96,6 @@ internal enum Compatibility : int
 
  private Compatibility m_Preload;
 
- private readonly static BuildTarget[] m_StandaloneTargets = BuildTargetDiscovery.StandaloneBuildTargets;
-
  internal class DefineConstraint
  {
  public string name;
@@ -174,15 +172,15 @@ private static int GetPlatformGroupArraySize()
 
  private static bool IsStandaloneTarget(BuildTarget buildTarget)
  {
- return m_StandaloneTargets.Contains(buildTarget);
+ return BuildTargetDiscovery.StandaloneBuildTargets.Contains(buildTarget);
  }
 
  private Compatibility compatibleWithStandalone
  {
  get
  {
  bool compatible = false;
- foreach (var t in m_StandaloneTargets)
+ foreach (var t in BuildTargetDiscovery.StandaloneBuildTargets)
  {
  // Return mixed value if one of the values is mixed
  if (m_CompatibleWithPlatform[(int)t] == Compatibility.Mixed)
@@ -196,7 +194,7 @@ private Compatibility compatibleWithStandalone
 
  set
  {
- foreach (var t in m_StandaloneTargets)
+ foreach (var t in BuildTargetDiscovery.StandaloneBuildTargets)
  m_CompatibleWithPlatform[(int)t] = value;
  }
  }

Modules/BuildProfileEditor/BuildProfileWindow.cs

@@ -317,7 +317,16 @@ internal void RepaintAndClearSelection()
  /// <see cref="m_BuildProfileContextMenu"/>.
  /// </summary>
  internal BuildProfileListEditableLabel CreateEditableLabelItem() => new BuildProfileListEditableLabel(
- m_BuildProfileContextMenu.UpdateBuildProfileLabelName,
+ (object buildProfileObject, string buildProfileLabelName) =>
+ {
+ bool isUpdated = m_BuildProfileContextMenu.UpdateBuildProfileLabelName(buildProfileObject, buildProfileLabelName);
+ if (isUpdated)
+ {
+ // The same path is used to force a repaint of the profile editor
+ OnBuildProfileCreated(buildProfileObject as BuildProfile);
+ }
+ return isUpdated;
+ },
  m_BuildProfileContextMenu.AddBuildProfileContextMenu());
 
  /// <summary>

Modules/BuildProfileEditor/Handlers/BuildProfileWindowSelection.cs

@@ -30,6 +30,7 @@ internal enum ListViewSelectionType
  readonly Label m_SelectedProfilePlatformLabel;
 
  readonly List<BuildProfile> m_SelectedBuildProfiles;
+ readonly Dictionary<GUID, int> m_MultiSelectLabelCountMap;
 
  internal bool IsSingleSelection() => m_SelectedBuildProfiles.Count == 1;
  internal bool IsMultipleSelection() => m_SelectedBuildProfiles.Count > 1;
@@ -44,6 +45,7 @@ internal BuildProfileWindowSelection(VisualElement rootVisualElement, PlatformLi
  {
  m_PlatformListViews = platformListView;
  m_SelectedBuildProfiles = new List<BuildProfile>();
+ m_MultiSelectLabelCountMap = new Dictionary<GUID, int>();
  m_SelectedProfileImage = rootVisualElement.Q<Image>("selected-profile-image");
  m_SelectedProfileNameLabel = rootVisualElement.Q<Label>("selected-profile-name");
  m_SelectedProfilePlatformLabel = rootVisualElement.Q<Label>("selected-profile-platform");
@@ -55,6 +57,7 @@ internal void UpdateSelectionGUI(BuildProfile profile)
  {
  m_SelectedProfileImage.image = BuildProfileModuleUtil.GetPlatformIcon(string.Empty);
  m_SelectedProfileNameLabel.text = $"{m_SelectedBuildProfiles.Count} Build Profiles";
+ m_SelectedProfilePlatformLabel.text = GetMultiSelectLabelString();
  }
  else
  {
@@ -170,5 +173,34 @@ internal void ClearSelectedProfiles()
  {
  m_SelectedBuildProfiles.Clear();
  }
+
+ string GetMultiSelectLabelString()
+ {
+ string labelText = string.Empty;
+
+ foreach (var buildProfile in m_SelectedBuildProfiles)
+ {
+ if (!m_MultiSelectLabelCountMap.TryAdd(new GUID(buildProfile.platformId), 1))
+ {
+ m_MultiSelectLabelCountMap[new GUID(buildProfile.platformId)]++;
+ }
+ }
+
+ int index = 0;
+ foreach (var platform in m_MultiSelectLabelCountMap)
+ {
+ var platformName = BuildProfileModuleUtil.GetClassicPlatformDisplayName(platform.Key.ToString());
+ labelText += $"{platform.Value} {platformName}";
+
+ if (++index < m_MultiSelectLabelCountMap.Count)
+ {
+ labelText += ", ";
+ }
+ }
+
+ labelText += $" {TrText.buildProfilesName}";
+ m_MultiSelectLabelCountMap.Clear();
+ return labelText;
+ }
  }
 }

Modules/EditorToolbar/ToolbarElements/PackageManagerButton.cs

@@ -0,0 +1,81 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEditor.PackageManager.UI;
+using UnityEditor.PackageManager.UI.Internal;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Toolbars
+{
+ [EditorToolbarElement("Package Management/Package Manager", typeof(DefaultMainToolbar))]
+ sealed class PackageManagerButton : ToolbarButton
+ {
+ private readonly IPackageDatabase m_PackageDatabase;
+ private readonly VisualElement m_Icon;
+ private Action m_ClickAction;
+
+ public PackageManagerButton()
+ {
+ m_PackageDatabase = ServicesContainer.instance.Resolve<IPackageDatabase>();
+ RegisterCallback<AttachToPanelEvent>(OnAttachedToPanel);
+ RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
+
+ name = "PackageManager";
+
+ m_Icon = new VisualElement { name = "image" };
+ Add(m_Icon);
+ AddToClassList("unity-toolbar-button-package-manager");
+
+ clicked += OnPackageManagerButtonClicked;
+
+ RefreshState();
+ }
+
+ private void OnAttachedToPanel(AttachToPanelEvent _)
+ {
+ m_PackageDatabase.onPackagesChanged += OnPackagesChanged;
+ }
+
+ private void OnPackagesChanged(PackagesChangeArgs _)
+ {
+ RefreshState();
+ }
+
+ private void OnDetachFromPanel(DetachFromPanelEvent _)
+ {
+ m_PackageDatabase.onPackagesChanged -= OnPackagesChanged;
+ }
+
+ private void RefreshState()
+ {
+ m_Icon.ClearClassList();
+
+ if (m_PackageDatabase.AnyNonCompliantPackagesInUse())
+ {
+ m_Icon.AddToClassList("error");
+ tooltip = L10n.Tr("Restricted Packages In Use");
+ m_ClickAction = () => PackageManagerWindow.OpenAndSelectPage(InProjectNonCompliancePage.k_Id);
+ }
+ else if (m_PackageDatabase.AnyExperimentalPackagesInUse())
+ {
+ m_Icon.AddToClassList("warning");
+ tooltip = L10n.Tr("Experimental Packages In Use");
+ m_ClickAction = () => PackageManagerWindow.OpenAndSelectPage(InProjectPage.k_Id, "experimental");
+ }
+ else
+ {
+ m_Icon.AddToClassList("default");
+ tooltip = L10n.Tr("Package Manager");
+ m_ClickAction = () => PackageManagerWindow.OpenAndSelectPackage(null);
+ }
+ }
+
+ private void OnPackageManagerButtonClicked()
+ {
+ m_ClickAction?.Invoke();
+ }
+ }
+}