Skip to content

Commit 833aca6

Browse files
author
Unity Technologies
committed
Unity 2021.2.0a10 C# reference source code
1 parent 9487f08 commit 833aca6

File tree

116 files changed

+3395
-1951
lines changed

Some content is hidden

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

116 files changed

+3395
-1951
lines changed

Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,10 @@ public void ForceRefresh()
353353

354354
private void PurgeSelection()
355355
{
356+
linkedWithSequencer = false;
357+
Object.DestroyImmediate(m_OverrideControlInterface);
358+
359+
// Selected object could have been changed when unlocking the animation window
356360
Object.DestroyImmediate(m_Selection);
357361
m_Selection = null;
358362
}

Editor/Mono/BuildPipeline/AssemblyStripper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private static bool StripAssembliesTo(string outputFolder, out string output, ou
144144
if (!string.IsNullOrEmpty(additionalArgs))
145145
args.Add(additionalArgs);
146146

147-
additionalArgs = Debug.GetDiagnosticSwitch("VMUnityLinkerAdditionalArgs") as string;
147+
additionalArgs = Debug.GetDiagnosticSwitch("VMUnityLinkerAdditionalArgs").value as string;
148148
if (!string.IsNullOrEmpty(additionalArgs))
149149
args.Add(additionalArgs.Trim('\''));
150150

0 commit comments

Comments
 (0)