Skip to content

Commit 10f8718

Browse files
author
Unity Technologies
committed
Unity 6000.2.0b3 C# reference source code
1 parent d6f29af commit 10f8718

File tree

283 files changed

+4835
-3196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+4835
-3196
lines changed

‎Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
132132
private string m_Hash;
133133
private int m_PreviewPage = 0;
134134
private int m_TotalPages = 0;
135-
const float kPrefixLabelWidth = 290f;
136135
private int[] m_OptionValues = null;
137136
private string[] m_OptionDisplays = null;
138137
private Texture2D[] m_PreviewTextures = null;
@@ -365,9 +364,6 @@ public override void OnInspectorGUI()
365364

366365
serializedObject.Update();
367366

368-
var oldWidth = EditorGUIUtility.labelWidth;
369-
EditorGUIUtility.labelWidth = kPrefixLabelWidth;
370-
371367
HandleCommonSettingUI();
372368

373369
GUILayout.Space(EditorGUI.kSpacing);
@@ -418,7 +414,6 @@ public override void OnInspectorGUI()
418414
}
419415
}
420416

421-
EditorGUIUtility.labelWidth = oldWidth;
422417
serializedObject.ApplyModifiedProperties();
423418
}
424419

‎Editor/Mono/Animation/AnimationUtility.bindings.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ internal static System.Type GetEditorCurveValueType(ScriptableObject scriptableO
188188
extern public static bool GetDiscreteIntValue([NotNull] GameObject root, EditorCurveBinding binding, out int data);
189189
public static bool GetObjectReferenceValue(GameObject root, EditorCurveBinding binding, out Object data)
190190
{
191-
data = Internal_GetObjectReferenceValue(root, binding);
192-
return data != null;
191+
data = Internal_GetObjectReferenceValue(root, binding, out bool result);
192+
return result;
193193
}
194194

195-
extern private static Object Internal_GetObjectReferenceValue([NotNull] GameObject root, EditorCurveBinding binding);
195+
extern private static Object Internal_GetObjectReferenceValue([NotNull] GameObject root, EditorCurveBinding binding, out bool result);
196196

197197
extern public static Object GetAnimatedObject([NotNull] GameObject root, EditorCurveBinding binding);
198198

‎Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchy.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
using UnityEditor;
66
using UnityEditor.IMGUI.Controls;
77
using UnityEngine;
8+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
9+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
10+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
811

912
namespace UnityEditorInternal
1013
{

‎Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyBuilder.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
using System.Linq;
1010
using UnityEditor.IMGUI.Controls;
1111
using Object = UnityEngine.Object;
12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
13+
using TreeViewUtility = UnityEditor.IMGUI.Controls.TreeViewUtility<int>;
1214

1315
namespace UnityEditorInternal
1416
{

‎Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
using UnityEditor;
66
using UnityEditor.IMGUI.Controls;
7+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
8+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
79

810
namespace UnityEditorInternal
911
{

‎Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
using UnityEngine;
88
using System.Collections.Generic;
99
using UnityEditor.ShortcutManagement;
10+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
11+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
12+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
1013

1114
namespace UnityEditorInternal
1215
{

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchy.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
using UnityEditor;
77
using System.Collections.Generic;
88
using UnityEditor.IMGUI.Controls;
9+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
10+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
11+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
912

1013
namespace UnityEditorInternal
1114
{

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
using UnityEditor.IMGUI.Controls;
88
using UnityEngine;
99
using Object = UnityEngine.Object;
10+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
11+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
12+
using TreeViewUtility = UnityEditor.IMGUI.Controls.TreeViewUtility<int>;
13+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
14+
1015

1116
namespace UnityEditorInternal
1217
{

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
using System.Linq;
1010
using UnityEditor.IMGUI.Controls;
1111

12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
13+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
14+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
15+
1216
namespace UnityEditorInternal
1317
{
1418
internal class AnimationWindowHierarchyGUI : TreeViewGUI

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyNode.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
using UnityEngine;
77
using System.Collections.Generic;
88
using UnityEditor.IMGUI.Controls;
9+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
10+
911

1012
namespace UnityEditorInternal
1113
{

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Collections.Generic;
1010
using UnityEditor.IMGUI.Controls;
1111
using Object = UnityEngine.Object;
12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
1213

1314
namespace UnityEditorInternal
1415
{
@@ -903,14 +904,14 @@ public CurveWrapper[] activeCurveWrappers
903904
{
904905
List<CurveWrapper> activeCurveWrappers = new List<CurveWrapper>();
905906
foreach (AnimationWindowCurve curve in activeCurves)
906-
if (!curve.isDiscreteCurve)
907-
activeCurveWrappers.Add(AnimationWindowUtility.GetCurveWrapper(curve, curve.clip));
907+
if (AnimationWindowUtility.GetCurveWrapper(curve, curve.clip) is CurveWrapper wrapper)
908+
activeCurveWrappers.Add(wrapper);
908909

909910
// If there are no active curves, we would end up with empty curve editor so we just give all curves insteads
910911
if (!activeCurveWrappers.Any())
911912
foreach (AnimationWindowCurve curve in filteredCurves)
912-
if (!curve.isDiscreteCurve)
913-
activeCurveWrappers.Add(AnimationWindowUtility.GetCurveWrapper(curve, curve.clip));
913+
if (AnimationWindowUtility.GetCurveWrapper(curve, curve.clip) is CurveWrapper wrapper)
914+
activeCurveWrappers.Add(wrapper);
914915

915916
m_ActiveCurveWrappersCache = activeCurveWrappers.ToArray();
916917
}

‎Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,10 @@ private static CurveWrapper.PreProcessKeyMovement CreateKeyPreprocessorForCurve(
12791279

12801280
public static CurveWrapper GetCurveWrapper(AnimationWindowCurve curve, AnimationClip clip)
12811281
{
1282+
//Discrete and PPtr curves are not allowed to create curve wrappers.
1283+
if (curve.isDiscreteCurve || curve.isPPtrCurve)
1284+
return null;
1285+
12821286
CurveWrapper curveWrapper = new CurveWrapper();
12831287
curveWrapper.renderer = CreateRendererForCurve(curve);
12841288
curveWrapper.preProcessKeyMovementDelegate = CreateKeyPreprocessorForCurve(curve);

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
[assembly: InternalsVisibleTo("Unity.PureCSharpTests")]
3636
[assembly: InternalsVisibleTo("Unity.IntegrationTests")]
3737
[assembly: InternalsVisibleTo("Unity.IntegrationTests.Android")]
38+
[assembly: InternalsVisibleTo("Unity.IntegrationTests.Android.CommonUtils")]
3839
[assembly: InternalsVisibleTo("Unity.IntegrationTests.Animation")]
3940
[assembly: InternalsVisibleTo("Unity.IntegrationTests.AssetImporting")]
4041
[assembly: InternalsVisibleTo("Unity.IntegrationTests.BuildPipeline")]
@@ -199,9 +200,15 @@
199200
[assembly: InternalsVisibleTo("Unity.GraphToolsAuthoringFramework.InternalEditorBridge")]
200201

201202
// Module test assemblies
203+
[assembly: InternalsVisibleTo("Unity.Modules.iOSExtensions.Tests.Editor")]
202204
[assembly: InternalsVisibleTo("Unity.Modules.Licensing.Tests.Editor")]
205+
[assembly: InternalsVisibleTo("Unity.Modules.PlatformIcons.Tests.Editor")]
203206
// This should move with the AnimationWindow to a module at some point
204207
[assembly: InternalsVisibleTo("Unity.Modules.Animation.AnimationWindow.Tests.Editor")]
205208
[assembly: InternalsVisibleTo("Unity.Modules.Physics.Tests.Editor")]
206209
[assembly: InternalsVisibleTo("Unity.Tests.Shared")]
207210

211+
// Test Assemblies
212+
[assembly: InternalsVisibleTo("Unity.Core.UnityEvent.Tests.Editor")]
213+
[assembly: InternalsVisibleTo("Unity.Core.Scripting.AssemblyVersion.Tests.Editor")]
214+

‎Editor/Mono/AttributeHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static MonoGizmoMethod[] ExtractGizmos(Assembly assembly)
112112
}
113113

114114
[RequiredByNativeCode]
115-
static string GetComponentMenuName(Type type)
115+
static object GetComponentMenuName(Type type)
116116
{
117117
var attrs = type.GetCustomAttributes(typeof(AddComponentMenu), false);
118118
if (attrs.Length > 0)

‎Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
using UnityEditor.Audio;
1212
using UnityEditor.IMGUI.Controls;
1313
using Object = UnityEngine.Object;
14+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
15+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
16+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
17+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
18+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
1419

1520
namespace UnityEditor
1621
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using UnityEditor.Audio;
1111
using UnityEditor.IMGUI.Controls;
1212
using RequiredByNativeCodeAttribute = UnityEngine.Scripting.RequiredByNativeCodeAttribute;
13+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
1314

1415
namespace UnityEditor
1516
{

‎Editor/Mono/Audio/Mixer/GUI/AudioMixersTreeView.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
using UnityEditor.IMGUI.Controls;
1313
using UnityEngine.Audio;
1414
using Object = UnityEngine.Object;
15+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
16+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
17+
using TreeViewUtility = UnityEditor.IMGUI.Controls.TreeViewUtility<int>;
18+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
19+
using TreeViewDragging = UnityEditor.IMGUI.Controls.TreeViewDragging<int>;
20+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
21+
using TreeViewItemAlphaNumericSort = UnityEditor.IMGUI.Controls.TreeViewItemAlphaNumericSort<int>;
22+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
1523

1624
namespace UnityEditor
1725
{

‎Editor/Mono/Audio/Mixer/GUI/ReorderableListWithRenameAndScrollView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using UnityEngine;
66
using UnityEditor;
77
using System;
8+
using RenameOverlay = UnityEditor.RenameOverlay<int>;
89

910
namespace UnityEditorInternal
1011
{

‎Editor/Mono/Audio/Mixer/GUI/TreeViewForAudioMixerGroups.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
using System.Collections.Generic;
99
using UnityEditor.IMGUI.Controls;
1010
using UnityEngine.Audio;
11+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
13+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
14+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
15+
1116

1217
namespace UnityEditor
1318
{

‎Editor/Mono/BuildPlayerSceneTreeView.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
using System.Collections.Generic;
77
using System.IO;
88
using UnityEditor.IMGUI.Controls;
9+
using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
10+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
11+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
912

1013
namespace UnityEditor
1114
{

‎Editor/Mono/BuildPlayerWindow.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using UnityEditor.Connect;
2222
using UnityEditor.Utils;
2323
using UnityEditor.Build.Profile;
24+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
2425

2526
namespace UnityEditor
2627
{
@@ -220,13 +221,13 @@ public BuildPlayerWindow()
220221

221222
BuildPlayerSceneTreeView m_TreeView;
222223
[SerializeField]
223-
IMGUI.Controls.TreeViewState m_TreeViewState;
224+
TreeViewState m_TreeViewState;
224225
void ActiveScenesGUI()
225226
{
226227
if (m_TreeView == null)
227228
{
228229
if (m_TreeViewState == null)
229-
m_TreeViewState = new IMGUI.Controls.TreeViewState();
230+
m_TreeViewState = new TreeViewState();
230231
m_TreeView = new BuildPlayerSceneTreeView(m_TreeViewState);
231232
m_TreeView.Reload();
232233
}

‎Editor/Mono/BuildProfile/BuildProfile.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,13 @@ void ValidateDataConsistency()
403403
}
404404

405405
CheckSceneListConsistency();
406+
407+
// On disk changes to active profile may change platform guid.
408+
// Specifically copying the entire YAML of a valid build profile.
409+
if (this == BuildProfileContext.activeProfile && platformGuid != EditorUserBuildSettings.activePlatformGuid)
410+
{
411+
EditorUserBuildSettings.SwitchActiveBuildTargetGuid(this);
412+
}
406413
}
407414

408415
/// <summary>

‎Editor/Mono/BuildProfile/BuildProfileContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ internal void ClearPackageAddInfo(BuildProfile profile)
153153
}
154154
}
155155

156-
string GetProfileGUID(BuildProfile profile)
156+
static string GetProfileGUID(BuildProfile profile)
157157
{
158158
var profilePath = AssetDatabase.GetAssetPath(profile);
159159
var profileGuid = AssetDatabase.AssetPathToGUID(profilePath);

‎Editor/Mono/BuildProfile/BuildProfileSceneListTreeView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using UnityEngine;
99
using UnityEngine.Bindings;
1010
using UnityEngine.SceneManagement;
11+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
1112

1213
namespace UnityEditor.Build.Profile
1314
{

‎Editor/Mono/BuildProfile/BuildProfileState.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ public BuildProfileWorkflowState(Action<BuildProfileWorkflowState> onStateChange
6767
/// </summary>
6868
public ActionState buildAndRunAction { get; set; } = ActionState.Enabled;
6969

70+
/// <summary>
71+
/// Allows invoking of Cloud Build for the selected profile.
72+
/// </summary>
73+
public ActionState buildInCloudPackageAction { get; set; } = ActionState.Enabled;
74+
7075
/// <summary>
7176
/// Additional actions shown in the Build Profile Window as generally defined by the Build Profile Extension.
7277
/// </summary>

‎Editor/Mono/BuildProfile/Events.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal struct Payload : IAnalytic.IData
2020
/// <summary>
2121
/// Platform ID of the target build profile.
2222
/// </summary>
23-
public GUID platformId;
23+
public string platformId;
2424

2525
/// <summary>
2626
/// Platform display name of the target build profile.
@@ -60,7 +60,7 @@ public static void SendBuildProfile()
6060

6161
EditorAnalytics.SendAnalytic(new BuildProfileBuildTimeEvent(new BuildProfileBuildTimeEvent.Payload
6262
{
63-
platformId = profile.platformGuid,
63+
platformId = profile.platformId,
6464
platformDisplayName = BuildProfileModuleUtil.GetClassicPlatformDisplayName(profile.platformGuid),
6565
profileAssetGUID = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(profile))
6666
}));

‎Editor/Mono/BuildTargetDiscovery.bindings.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public PlatformInfo() {}
256256

257257
static GUID EmptyGuid = new GUID("");
258258

259-
static Dictionary<BuildTarget, GUID> s_PlatformGUIDDataQuickLookup = new Dictionary<BuildTarget, GUID>();
259+
static Dictionary<BuildTarget, GUID> s_BuildTargetToPlatformGUID = new Dictionary<BuildTarget, GUID>();
260260

261261
// This list should not be exposed ouside of BuildTargetDiscovery to avoid NDA spillage, provide a access function for data here instead.
262262
// Changes here should be synced with the usage of
@@ -662,10 +662,7 @@ public static GUID GetGUIDFromBuildTarget(NamedBuildTarget namedBuildTarget, Bui
662662
/// <returns>The platform GUID. Derived platform GUID when the active platform is a derived platform. Base platform GUID otherwise.</returns>
663663
public static GUID GetGUIDFromBuildTarget(BuildTarget buildTarget)
664664
{
665-
if (buildTarget == BuildTarget.StandaloneWindows) //workaround for win64 and win having the same guid in new Build Target system
666-
buildTarget = BuildTarget.StandaloneWindows64;
667-
668-
if (s_PlatformGUIDDataQuickLookup.TryGetValue(buildTarget, out GUID value))
665+
if (s_BuildTargetToPlatformGUID.TryGetValue(buildTarget, out GUID value))
669666
{
670667
var module = ModuleManager.FindPlatformSupportModule(value);
671668
if (module != null && module is IDerivedBuildTargetProvider)
@@ -704,7 +701,7 @@ internal static GUID GetBasePlatformGUIDFromBuildTarget(NamedBuildTarget namedBu
704701
if (TryGetServerGUIDFromBuildTarget(namedBuildTarget, buildTarget, out var value))
705702
return value;
706703

707-
if (s_PlatformGUIDDataQuickLookup.TryGetValue(buildTarget, out GUID guid))
704+
if (s_BuildTargetToPlatformGUID.TryGetValue(buildTarget, out GUID guid))
708705
return guid;
709706

710707
return EmptyGuid;
@@ -723,7 +720,7 @@ internal static GUID GetBasePlatformGUID(GUID platformGuid)
723720
if (!platformInfo.HasFlag(PlatformAttributes.IsDerivedBuildTarget))
724721
return platformGuid;
725722

726-
if (s_PlatformGUIDDataQuickLookup.TryGetValue(platformInfo.buildTarget, out GUID basePlatformGuid))
723+
if (s_BuildTargetToPlatformGUID.TryGetValue(platformInfo.buildTarget, out GUID basePlatformGuid))
727724
return basePlatformGuid;
728725

729726
return EmptyGuid;
@@ -741,12 +738,15 @@ static void PreloadBuildPlatformInstalledData()
741738
{
742739
foreach (var platform in allPlatforms)
743740
{
741+
// Capture BuildTarget to GUID mapping for all platforms.
742+
// Considers that StandaloneWindows and StandaloneWindows64 are the same platform.
744743
if (platform.Value.buildTarget != BuildTarget.StandaloneWindows
745744
&& platform.Value.subtarget != StandaloneBuildSubtarget.Server
746-
&& !platform.Value.HasFlag(PlatformAttributes.IsDerivedBuildTarget)
747-
) //workaround for win64 and win having the same guid in new Build Target system and for derived build targets
745+
&& !platform.Value.HasFlag(PlatformAttributes.IsDerivedBuildTarget))
748746
{
749-
s_PlatformGUIDDataQuickLookup.Add(platform.Value.buildTarget, platform.Key);
747+
s_BuildTargetToPlatformGUID.Add(platform.Value.buildTarget, platform.Key);
748+
if (platform.Value.buildTarget == BuildTarget.StandaloneWindows64)
749+
s_BuildTargetToPlatformGUID.Add(BuildTarget.StandaloneWindows, platform.Key);
750750
}
751751

752752
var playbackEngineDirectory = BuildPipeline.GetPlaybackEngineDirectory(platform.Value.buildTarget, BuildOptions.None, false);

0 commit comments

Comments
 (0)