Unity 2021.2.0a16 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -8,10 +8,10 @@ public class Plugin
     {
         public string AssetPath;
         public string DestinationPath;
-
+        public string Architecture;
         public override string ToString()
         {
-            return $"'{AssetPath} -> '{DestinationPath}'";
+            return $"'{AssetPath} -> '{DestinationPath}' ({Architecture})";
         }
     }
 

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -97,6 +97,8 @@ public static class SpriteAtlasExtensions
         extern public static void SetIsVariant([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, bool value);
         extern public static void SetMasterAtlas([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, SpriteAtlas value);
         extern public static void SetVariantScale([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, float value);
+        extern public static bool IsIncludeInBuild([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas);
+        extern public static SpriteAtlas GetMasterAtlas([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas);
         extern internal static void CopyMasterAtlasSettings([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas);
         extern internal static string GetHash([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas);
         extern internal static Texture2D[] GetPreviewTextures([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas);

Editor/Mono/2D/SpriteAtlas/SpriteAtlasAsset.bindings.cs

@@ -26,6 +26,8 @@ public class SpriteAtlasAsset : UnityEngine.Object
         extern public void SetIsVariant(bool value);
         extern public void SetMasterAtlas(SpriteAtlas atlas);
         extern public void SetIncludeInBuild(bool value);
+        extern public bool IsIncludeInBuild();
+        extern public SpriteAtlas GetMasterAtlas();
         extern public void SetVariantScale(float value);
         extern public void SetPlatformSettings(TextureImporterPlatformSettings src);
         extern public TextureImporterPlatformSettings GetPlatformSettings(string buildTarget);

Editor/Mono/AssemblyReloadEvents.cs

@@ -9,21 +9,33 @@ namespace UnityEditor
     public static class AssemblyReloadEvents
     {
         public delegate void AssemblyReloadCallback();
-        public static event AssemblyReloadCallback beforeAssemblyReload;
-        public static event AssemblyReloadCallback afterAssemblyReload;
+        public static event AssemblyReloadCallback beforeAssemblyReload
+        {
+            add => m_BeforeAssemblyReloadEvent.Add(value);
+            remove => m_BeforeAssemblyReloadEvent.Remove(value);
+        }
+        private static EventWithPerformanceTracker<AssemblyReloadCallback> m_BeforeAssemblyReloadEvent =
+            new EventWithPerformanceTracker<AssemblyReloadCallback>($"{nameof(AssemblyReloadEvents)}.{nameof(beforeAssemblyReload)}");
+        public static event AssemblyReloadCallback afterAssemblyReload
+        {
+            add => m_AfterAssemblyReloadEvent.Add(value);
+            remove => m_AfterAssemblyReloadEvent.Remove(value);
+        }
+        private static EventWithPerformanceTracker<AssemblyReloadCallback> m_AfterAssemblyReloadEvent =
+            new EventWithPerformanceTracker<AssemblyReloadCallback>($"{nameof(AssemblyReloadEvents)}.{nameof(afterAssemblyReload)}");
 
         [RequiredByNativeCode]
         static void OnBeforeAssemblyReload()
         {
-            if (beforeAssemblyReload != null)
-                beforeAssemblyReload();
+            foreach (var evt in m_BeforeAssemblyReloadEvent)
+                evt();
         }
 
         [RequiredByNativeCode]
         static void OnAfterAssemblyReload()
         {
-            if (afterAssemblyReload != null)
-                afterAssemblyReload();
+            foreach (var evt in m_AfterAssemblyReloadEvent)
+                evt();
         }
     }
 }

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

@@ -41,7 +41,7 @@ public struct SpriteImportData
     public struct TextureGenerationOutput
     {
         [NativeName("texture")]
-        private Texture2D m_Texture;
+        private Texture m_Texture;
         [NativeName("importInspectorWarnings")]
         private string m_ImportInspectorWarnings;
         [NativeName("importWarnings")]
@@ -51,7 +51,7 @@ public struct TextureGenerationOutput
         [NativeName("sprites")]
         private Sprite[] m_Sprites;
 
-        public Texture2D texture { get { return m_Texture; } }
+        public Texture2D texture { get { return m_Texture as Texture2D; } }
         public string importInspectorWarnings { get { return m_ImportInspectorWarnings; } }
         public string[] importWarnings { get { return m_ImportWarnings; } }
         public Texture2D thumbNail { get { return m_ThumbNail; } }

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -251,6 +251,8 @@ public static bool IsDefaultPlatformTextureFormatValid(TextureImporterType textu
         [NativeProperty("VTOnly")]
         public extern bool vtOnly { get; set; }
 
+        internal extern bool ignoreMasterTextureLimit { get; set; }
+
         // Generate mip maps for the texture?
         public extern bool mipmapEnabled { get; set; }
         // Keep texture borders the same when generating mipmaps?

Editor/Mono/AssetPipeline/TextureImporterTypes.bindings.cs

@@ -64,6 +64,8 @@ public sealed partial class TextureImporterSettings
         [SerializeField]
         int  m_StreamingMipmapsPriority;
 
+        [SerializeField]
+        int m_IgnoreMasterTextureLimit;
 
         [SerializeField]
         int    m_NPOTScale;
@@ -300,6 +302,11 @@ public int streamingMipmapsPriority
             set { m_StreamingMipmapsPriority = value; }
         }
 
+        internal bool ignoreMasterTextureLimit
+        {
+            get { return m_IgnoreMasterTextureLimit != 0; }
+            set { m_IgnoreMasterTextureLimit = value ? 1 : 0; }
+        }
 
         public TextureImporterNPOTScale npotScale
         {

Editor/Mono/AssetPostprocessor.cs

@@ -167,7 +167,17 @@ static void InitPostprocessors(AssetImportContext context, string pathName)
         {
             m_ImportProcessors = new ArrayList();
             var analyticsEvent = new AssetPostProcessorAnalyticsData();
-            analyticsEvent.importActionId = ((int)Math.Floor(AssetImporter.GetAtPath(pathName).GetImportStartTime() * 1000)).ToString();
+
+            // This may happen if the processors are initialized outside a proper importer context. This is currently
+            // used by the TextureGenerator to be able to invoke the postprocessors on the generated texture.
+            if (AssetImporter.GetAtPath(pathName) != null)
+            {
+                analyticsEvent.importActionId = ((int)Math.Floor(AssetImporter.GetAtPath(pathName).GetImportStartTime() * 1000)).ToString();
+            }
+            else
+            {
+                analyticsEvent.importActionId = "None";
+            }
             s_AnalyticsEventsStack.Push(analyticsEvent);
 
             // @TODO: This is just a temporary workaround for the import settings.
@@ -396,7 +406,9 @@ static string GetTextureProcessorsHashString()
                     var type = inst.GetType();
                     bool hasPreProcessMethod = type.GetMethod("OnPreprocessTexture", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null;
                     bool hasPostProcessMethod = (type.GetMethod("OnPostprocessTexture", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null) ||
-                        (type.GetMethod("OnPostprocessCubemap", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null);
+                        (type.GetMethod("OnPostprocessCubemap", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null) ||
+                        (type.GetMethod("OnPostprocessTexture3D", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null) ||
+                        (type.GetMethod("OnPostprocessTexture2DArray", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) != null);
                     uint version = inst.GetVersion();
                     if (hasPreProcessMethod || hasPostProcessMethod)
                     {
@@ -437,6 +449,20 @@ static void PostprocessCubemap(Cubemap tex, string pathName)
             CallPostProcessMethods("OnPostprocessCubemap", args);
         }
 
+        [RequiredByNativeCode]
+        static void PostprocessTexture3D(Texture3D tex, string pathName)
+        {
+            object[] args = { tex };
+            CallPostProcessMethods("OnPostprocessTexture3D", args);
+        }
+
+        [RequiredByNativeCode]
+        static void PostprocessTexture2DArray(Texture2DArray tex, string pathName)
+        {
+            object[] args = { tex };
+            CallPostProcessMethods("OnPostprocessTexture2DArray", args);
+        }
+
         [RequiredByNativeCode]
         static void PostprocessSprites(Texture2D tex, string pathName, Sprite[] sprites)
         {
@@ -617,6 +643,11 @@ static void CallPostProcessMethodsUntilReturnedObjectIsValid<T>(string methodNam
 
         static void CallPostProcessMethods(string methodName, object[] args)
         {
+            if (m_ImportProcessors == null)
+            {
+                throw new Exception("m_ImportProcessors is null, InitPostProcessors should be called before any of the post process methods are called.");
+            }
+
             if (IsAssetPostprocessorAnalyticsEnabled())
             {
                 int invocationCount = 0;

Editor/Mono/AssetStore/AssetStoreWindow.cs

@@ -50,7 +50,7 @@ public void OnEnable()
                 var lightStyleSheet = EditorGUIUtility.Load(EditorUIService.instance.GetUIToolkitDefaultCommonLightStyleSheetPath()) as StyleSheet;
                 var assetStoreStyleSheet = EditorGUIUtility.Load("StyleSheets/AssetStore/AssetStoreWindow.uss") as StyleSheet;
                 var styleSheet = CreateInstance<StyleSheet>();
-                styleSheet.isUnityStyleSheet = true;
+                styleSheet.isDefaultStyleSheet = true;
 
                 var resolver = new StyleSheets.StyleSheetResolver();
                 resolver.AddStyleSheets(lightStyleSheet, assetStoreStyleSheet);