Unity 6000.0.4f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs

@@ -136,11 +136,11 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
 
  void UpdateAfterAssetChange()
  {
+ m_AllControllers = FindAllAudioMixerControllers();
+
  if (m_MixersTree == null)
  Init();
 
- m_AllControllers = FindAllAudioMixerControllers();
-
  if (m_Controller != null)
  {
  m_Controller.SanitizeGroupViews();

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -147,9 +147,7 @@ internal bool IsActiveBuildProfileOrPlatform()
  || !BuildProfileContext.IsClassicPlatformProfile(this))
  return false;
 
- var activePlatformId = BuildProfileModuleUtil.GetPlatformId(
- EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.standaloneBuildSubtarget);
- return platformId == activePlatformId;
+ return platformId == EditorUserBuildSettings.activePlatformGuid.ToString();
  }
 
  [VisibleToOtherModules]

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -90,7 +90,7 @@ public static bool IsModuleInstalled(string platformId)
  return installed
  && BuildPipeline.LicenseCheck(buildTarget)
  && !string.IsNullOrEmpty(moduleName)
- && ModuleManager.GetBuildProfileExtension(moduleName) != null;
+ && ModuleManager.IsPlatformSupportLoaded(moduleName);
  }
 
  /// <summary>
@@ -183,18 +183,7 @@ public static string GetModuleName(string platformId)
  /// </summary>
  public static void SwitchLegacyActiveFromBuildProfile(BuildProfile profile)
  {
- var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(profile.buildTarget);
-
- if (buildTargetGroup == BuildTargetGroup.Standalone)
- {
- EditorUserBuildSettings.SwitchActiveBuildTargetAndSubtarget(
- profile.buildTarget,
- (int)profile.subtarget);
- return;
- }
-
- // Subtarget fetched by EditorUserBuildSettings maps to the active build profile.
- EditorUserBuildSettings.SwitchActiveBuildTarget(buildTargetGroup, profile.buildTarget);
+ EditorUserBuildSettings.SwitchActiveBuildTargetGuid(new GUID(profile.platformId));
  }
 
  public static void SwitchLegacySelectedBuildTargets(BuildProfile profile)

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -138,6 +138,17 @@ public static bool TryGetProperties<T>(BuildTarget platform, out T properties) w
  BuildTarget.StandaloneLinux64,
  };
 
+ static bool IsStandalonePlatform(BuildTarget buildTarget)
+ {
+ foreach (var target in StandaloneBuildTargets)
+ {
+ if (target == buildTarget)
+ return true;
+ }
+
+ return false;
+ }
+
  [RequiredByNativeCode]
  internal static bool DoesBuildTargetSupportStereoInstancingRendering(BuildTarget buildTarget)
  {
@@ -324,7 +335,7 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
  };
 
  // Changes here should be synced with the usage of
- // BuildTargetDiscovery::HideInUI flag in [Platfrom]BuildTarget.cpp
+ // BuildTargetDiscovery::HideInUI flag in [Platform]BuildTarget.cpp
  internal static GUID[] hiddenPlatforms { get; } = new GUID[]
  {
  s_platform_38,
@@ -449,7 +460,7 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
  { s_platform_102, L10n.Tr("*standard install form hub") },
  };
 
- // Name changes here must be reflected in the platform [PLATFORM]BuildTarget.cs and [Platfrom]BuildTarget.cpp respective DisplayName and niceName
+ // Name changes here must be reflected in the platform [PLATFORM]BuildTarget.cs and [Platform]BuildTarget.cpp respective DisplayName and niceName
  static Dictionary<GUID, string> s_PlatformDisplayName = new()
  {
  { s_platform_02, "macOS" },
@@ -474,7 +485,7 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
  { s_platform_102, "macOS Server" },
  };
 
- // Changes here should be synced with [Platfrom]BuildTarget.cpp respective iconName
+ // Changes here should be synced with [Platform]BuildTarget.cpp respective iconName
  static readonly Dictionary<GUID, string> k_PlatformIconName = new()
  {
  { s_platform_02, "BuildSettings.OSX" },
@@ -550,7 +561,7 @@ static void PreloadBuildPlatformInstalledData()
  continue;
  }
 
- if (!PlatformHasFlag(buildTarget, TargetAttributes.IsStandalonePlatform))
+ if (!IsStandalonePlatform(buildTarget))
  {
  k_PlatformInstalledData.Add(platform, true);
  continue;
@@ -705,7 +716,7 @@ public static bool BuildPlatformIsUnderNDA(IBuildTarget platform)
  return false;
  }
 
- [System.Obsolete("BuildPlatfromIsHiddenInUI(BuildTarget) is obsolete. Use BuildPlatfromIsHiddenInUI(IBuildTarget) instead.", false)]
+ [System.Obsolete("BuildPlatformIsHiddenInUI(BuildTarget) is obsolete. Use BuildPlatformIsHiddenInUI(IBuildTarget) instead.", false)]
  public static bool BuildPlatformIsHiddenInUI(BuildTarget platform) =>
  BuildPlatformIsHiddenInUI(GetGUIDFromBuildTarget(platform));
 

Editor/Mono/EditorGUIUtility.cs

@@ -929,7 +929,7 @@ internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanc
  else if (type != null)
  {
  s_ObjectContent.text = GetTypeNameWithInfo(type.Name, instanceID);
- s_ObjectContent.image = AssetPreview.GetMiniTypeThumbnail(type);
+ s_ObjectContent.image = null; // Do not show icon when the reference is null as the type is already included in the label (UUM-16396)
  }
  else
  {

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -779,6 +779,44 @@ public static extern WindowsBuildAndRunDeployTarget windowsBuildAndRunDeployTarg
  // The currently active build target.
  public static extern BuildTarget activeBuildTarget { get; }
 
+ private static extern GUID GetInternalActivePlatformGuid();
+
+ // Internal setter only to be used for testing.
+ internal static extern void SetActivePlatformGuid(GUID platformId);
+
+ internal static GUID activePlatformGuid
+ {
+ get
+ {
+ GUID activePlatformGuid = GetInternalActivePlatformGuid();
+ GUID buildTargetGuid = BuildTargetDiscovery.GetGUIDFromBuildTarget(EditorUserBuildSettingsUtils.CalculateActiveNamedBuildTarget(), activeBuildTarget);
+
+ // TODO: Account for derived platforms.
+ // Jira https://jira.unity3d.com/browse/PLAT-9234
+ if (activePlatformGuid.Empty())
+ return buildTargetGuid;
+
+ if(activePlatformGuid != buildTargetGuid)
+ return buildTargetGuid;
+
+ return activePlatformGuid;
+ }
+ }
+
+ [NativeMethod("SwitchActiveBuildTargetGuid")]
+ private static extern bool SwitchActiveBuildTargetAndSubTargetGuid(GUID platformGuid, BuildTarget target, int subtarget);
+ internal static bool SwitchActiveBuildTargetGuid(GUID platformGuid)
+ {
+ // TODO: Account for derived platforms.
+ // Jira https://jira.unity3d.com/browse/PLAT-9234
+ var (buildTargetFromGuid, subTargetFromGuid) = BuildTargetDiscovery.GetBuildTargetAndSubtargetFromGUID(platformGuid);
+
+ int activeSubtarget = (int)subTargetFromGuid;
+ if(subTargetFromGuid == StandaloneBuildSubtarget.Default)
+ activeSubtarget = EditorUserBuildSettings.GetActiveSubtargetFor(buildTargetFromGuid);
+
+ return SwitchActiveBuildTargetAndSubTargetGuid(platformGuid, buildTargetFromGuid, activeSubtarget);
+ }
 
  // The currently active build target.
  internal static extern BuildTargetGroup activeBuildTargetGroup { get; }
@@ -793,8 +831,8 @@ public static bool SwitchActiveBuildTarget(BuildTargetGroup targetGroup, BuildTa
  public static bool SwitchActiveBuildTargetAsync(BuildTargetGroup targetGroup, BuildTarget target)
  => SwitchActiveBuildTargetAndSubtargetAsync(target, EditorUserBuildSettings.GetActiveSubtargetFor(target));
 
- public static bool SwitchActiveBuildTarget(NamedBuildTarget namedBuildTarget, BuildTarget target) =>
- BuildPlatforms.instance.BuildPlatformFromNamedBuildTarget(namedBuildTarget).SetActive(target);
+ public static bool SwitchActiveBuildTarget(NamedBuildTarget namedBuildTarget, BuildTarget target)
+ => BuildPlatforms.instance.BuildPlatformFromNamedBuildTarget(namedBuildTarget).SetActive(target);
 
  // This is used by tests -- note that it does tell the editor that current platform is X, without
  // validating if support for it is installed. However it does not do things like script recompile

Editor/Mono/GUI/ObjectField.cs

@@ -17,6 +17,8 @@ public sealed partial class EditorGUI
  static private GUIContent s_TypeMismatch = EditorGUIUtility.TrTextContent("Type mismatch");
  static private GUIContent s_Select = EditorGUIUtility.TrTextContent("Select");
 
+ const float k_NullObjectReferenceOpacity = 0.7f;
+
  [Flags]
  [VisibleToOtherModules("UnityEditor.UIBuilderModule")]
  internal enum ObjectFieldValidatorOptions
@@ -417,24 +419,40 @@ static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Ob
  temp = EditorGUIUtility.ObjectContent(obj, objType, property, validator);
  }
 
- switch (visualType)
+ var contentColor = GUI.contentColor;
+ var oldAlpha = contentColor.a;
+ try
  {
- case ObjectFieldVisualType.IconAndText:
- BeginHandleMixedValueContentColor();
- style.Draw(position, temp, id, DragAndDrop.activeControlID == id, position.Contains(Event.current.mousePosition));
-
- Rect buttonRect = buttonStyle.margin.Remove(GetButtonRect(visualType, position));
- buttonStyle.Draw(buttonRect, GUIContent.none, id, DragAndDrop.activeControlID == id, buttonRect.Contains(Event.current.mousePosition));
- EndHandleMixedValueContentColor();
- break;
- case ObjectFieldVisualType.LargePreview:
- DrawObjectFieldLargeThumb(position, id, obj, temp);
- break;
- case ObjectFieldVisualType.MiniPreview:
- DrawObjectFieldMiniThumb(position, id, obj, temp);
- break;
- default:
- throw new ArgumentOutOfRangeException();
+ // Show label with 70% opacity when null. (UUM-16396)
+ if (obj == null)
+ {
+ contentColor.a = k_NullObjectReferenceOpacity;
+ GUI.contentColor = contentColor;
+ }
+ switch (visualType)
+ {
+ case ObjectFieldVisualType.IconAndText:
+ BeginHandleMixedValueContentColor();
+ style.Draw(position, temp, id, DragAndDrop.activeControlID == id, position.Contains(Event.current.mousePosition));
+
+ Rect buttonRect = buttonStyle.margin.Remove(GetButtonRect(visualType, position));
+ buttonStyle.Draw(buttonRect, GUIContent.none, id, DragAndDrop.activeControlID == id, buttonRect.Contains(Event.current.mousePosition));
+ EndHandleMixedValueContentColor();
+ break;
+ case ObjectFieldVisualType.LargePreview:
+ DrawObjectFieldLargeThumb(position, id, obj, temp);
+ break;
+ case ObjectFieldVisualType.MiniPreview:
+ DrawObjectFieldMiniThumb(position, id, obj, temp);
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ }
+ finally
+ {
+ contentColor.a = oldAlpha;
+ GUI.contentColor = contentColor;
  }
  break;
  }

Editor/Mono/Inspector/AudioClipInspector.cs

@@ -309,7 +309,7 @@ public override void OnPreviewGUI(Rect r, GUIStyle background)
  }
 
  // force update GUI
- if (playing)
+ if (playing && GUIView.current != null)
  GUIView.current.Repaint();
  }
 

Editor/Mono/PlayerSettingsAndroid.bindings.cs

@@ -267,12 +267,20 @@ public static extern int minimumWindowHeight
  set;
  }
 
- // Should window resizing be allowed.
- public static extern bool resizableWindow
+ [Obsolete("resizableWindow has been deprecated and renamed to match Android documentation. Please use resizeableActivity instead. (UnityUpgradable) -> resizeableActivity", false)]
+ // Should application resizing be allowed (deprecated old naming).
+ public static bool resizeableWindow
  {
- [NativeMethod("GetAndroidResizableWindow")]
+ set => resizeableActivity = value;
+ get => resizeableActivity;
+ }
+
+ // Should application resizing be allowed (new naming).
+ public static extern bool resizeableActivity
+ {
+ [NativeMethod("GetAndroidResizeableActivity")]
  get;
- [NativeMethod("SetAndroidResizableWindow")]
+ [NativeMethod("SetAndroidResizeableActivity")]
  set;
  }