Skip to content

Commit af7ab1a

Browse files
author
Unity Technologies
committed
Unity 2021.2.0a13 C# reference source code
1 parent 920f9d9 commit af7ab1a

File tree

585 files changed

+12814
-5119
lines changed

Some content is hidden

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

585 files changed

+12814
-5119
lines changed

Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public class ConfigurationData
1818
public string Il2CppPath;
1919
public string NetCoreRunPath;
2020
public string EditorContentsPath;
21-
public string ProjectDirectory;
2221
public PackageInfo[] Packages;
2322
public string UnityVersion;
2423
public string UnitySourceCodePath;

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public class Il2CppConfig
7070
public string[] AdditionalArgs = new string[0];
7171
public string ExtraTypes;
7272
public bool CreateSymbolFiles;
73+
public bool AllowDebugging;
7374
}
7475

7576
public class Services

Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ScriptCompilationBuildProgram.Data
77
public static class Constants
88
{
99
public const string ScriptAssembliesTarget = "ScriptAssemblies";
10-
public const string MovedFromExtension = "movedfrom";
10+
public const string MovedFromExtension = "mvfrm";
1111
}
1212

1313
public class ScriptCompilationData

Editor/Mono/Animation/TransitionPreview.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,6 @@ public void DoTransitionPreview()
597597
if (m_Controller == null)
598598
return;
599599

600-
if (Event.current.type == EventType.Repaint)
601-
m_AvatarPreview.timeControl.Update();
602-
603600
DoTimeline();
604601

605602
// Draw the blend values
@@ -718,7 +715,12 @@ public void OnInteractivePreviewGUI(Rect r, GUIStyle background)
718715
{
719716
if (m_AvatarPreview != null && m_Controller != null)
720717
{
721-
if (m_LastEvalTime != m_AvatarPreview.timeControl.currentTime && Event.current.type == EventType.Repaint)
718+
bool isRepaint = (Event.current.type == EventType.Repaint);
719+
720+
if (isRepaint)
721+
m_AvatarPreview.timeControl.Update();
722+
723+
if (m_LastEvalTime != m_AvatarPreview.timeControl.currentTime && isRepaint)
722724
{
723725
m_AvatarPreview.Animator.playbackTime = m_AvatarPreview.timeControl.currentTime;
724726
m_AvatarPreview.Animator.Update(0);

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,7 @@
128128

129129
[assembly: InternalsVisibleTo("Unity.SceneTemplate.Editor")]
130130
[assembly: InternalsVisibleTo("com.unity.purchasing.udp.Editor")]
131+
[assembly: InternalsVisibleTo("com.unity.search.extensions.editor")]
132+
131133

132134
[assembly: AssemblyIsEditorAssembly]

Editor/Mono/AssetPipeline/ShaderIncludeImporter.bindings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal sealed partial class ShaderIncludeImporter : AssetImporter
1313
}
1414

1515
[NativeHeader("Editor/Src/Shaders/ShaderInclude.h")]
16-
internal sealed partial class ShaderInclude : Object
16+
public sealed partial class ShaderInclude : TextAsset
1717
{
1818
}
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ void HandleCommandEvents(int treeViewKeyboardControlID)
645645
{
646646
Event.current.Use();
647647
if (execute)
648-
ProjectWindowUtil.DuplicateAssets(m_TreeView.GetSelection());
648+
AssetClipboardUtility.DuplicateAssets(m_TreeView.GetSelection());
649649
}
650650
}
651651
}

Editor/Mono/Audio/WaveformPreview.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ bool UpdateTexture(int width, int channels)
206206
}
207207
else
208208
{
209-
m_Texture.Resize(s_BaseTextureWidth, textureHeight);
209+
m_Texture.Reinitialize(s_BaseTextureWidth, textureHeight);
210210
}
211211

212212
if (!clear)

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,12 +467,21 @@ private void CopyStagingAreaIntoDestination(BuildPostProcessArgs args, HashSet<s
467467
{
468468
destinationFolder = Directory.GetCurrentDirectory();
469469
}
470+
471+
HashSet<string> fileExtensionsToInclude = new HashSet<string>
472+
{
473+
".exe",
474+
".dll",
475+
".winmd",
476+
".pdb",
477+
};
478+
470479
// Copy entire staging area over
471-
CopyFilesToDestination(args.stagingArea, destinationFolder, filesToNotOverwrite);
480+
CopyFilesToDestination(args.stagingArea, destinationFolder, filesToNotOverwrite, fileExtensionsToInclude);
472481
args.report.RecordFilesMoved(args.stagingArea, destinationFolder);
473482
}
474483

475-
private static void CopyFilesToDestination(string source, string target, HashSet<string> filesToNotOverwrite)
484+
private static void CopyFilesToDestination(string source, string target, HashSet<string> filesToNotOverwrite, HashSet<string> fileExtensionsToIncludeInManagedDirectory)
476485
{
477486
if (!Directory.Exists(target))
478487
{
@@ -481,6 +490,9 @@ private static void CopyFilesToDestination(string source, string target, HashSet
481490

482491
foreach (string sourceFile in Directory.GetFiles(source))
483492
{
493+
if (Path.GetDirectoryName(source) == "Managed" && !fileExtensionsToIncludeInManagedDirectory.Contains(Path.GetExtension(sourceFile)))
494+
continue;
495+
484496
var targetFile = Path.Combine(target, Path.GetFileName(sourceFile));
485497

486498
if (File.Exists(targetFile))
@@ -495,7 +507,7 @@ private static void CopyFilesToDestination(string source, string target, HashSet
495507
}
496508

497509
foreach (var directory in Directory.GetDirectories(source))
498-
CopyFilesToDestination(directory, Path.Combine(target, Path.GetFileName(directory)), filesToNotOverwrite);
510+
CopyFilesToDestination(directory, Path.Combine(target, Path.GetFileName(directory)), filesToNotOverwrite, fileExtensionsToIncludeInManagedDirectory);
499511
}
500512

501513
protected abstract string GetStagingAreaPluginsFolder(BuildPostProcessArgs args);

Editor/Mono/BuildPlayerWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
991991
EditorUserBuildSettings.installInBuildFolder = GUILayout.Toggle(EditorUserBuildSettings.installInBuildFolder, styles.installInBuildFolder, GUILayout.ExpandWidth(false));
992992
if (GUILayout.Button(styles.installInBuildFolderHelp, EditorStyles.iconButton))
993993
{
994-
var path = Path.Combine(Directory.GetParent(EditorApplication.applicationPath).FullName, "../../Documentation/BuildDocs/view");
994+
var path = Path.Combine(Unsupported.GetBaseUnityDeveloperFolder(), "Documentation/BuildDocs/view");
995995
if (Application.platform == RuntimePlatform.WindowsEditor)
996996
System.Diagnostics.Process.Start(path + ".cmd");
997997
else

0 commit comments

Comments
 (0)