Unity 2022.1.0a9 C# reference source code

Author: Unity Technologies

Editor/Mono/EditorUserSettings.bindings.cs

@@ -77,6 +77,10 @@ public static string GetConfigValue(string name)
 
         public static extern int desiredImportWorkerCount { get; set; }
 
+        public static extern int standbyImportWorkerCount { get; set; }
+
+        public static extern int idleImportWorkerShutdownDelayMilliseconds { get; set; }
+
         internal static extern void SoftReset();
     }
 }

Editor/Mono/Inspector/EditorSettingsInspector.cs

@@ -24,12 +24,15 @@ class Content
             public static GUIContent joystickSource = EditorGUIUtility.TrTextContent("Joystick Source");
 
             public static GUIContent mode = EditorGUIUtility.TrTextContent("Mode");
-            public static GUIContent refresh = EditorGUIUtility.TrTextContent("Refresh");
-            public static GUIContent refreshImportMode = EditorGUIUtility.TrTextContent("Import mode", "During an asset database refresh this mode determines if the imports are done: Entirely inside the editor process (In Process). In one or more worker processes potentially in parallel by importer queue index (Out of process by queue).");
-            public static GUIContent desiredImportWorkerCount = EditorGUIUtility.TrTextContent("Desired worker count", "The desired number of import worker processes to keep around and ready for importing. The actual number of worker processes on the system can be both lower or higher that this, but the system will seek towards this number.");
+            public static GUIContent parallelImport = EditorGUIUtility.TrTextContent("Parallel Import", "During an asset database refresh some asset imports can be performed in parallel in sub processes.");
+            public static GUIContent parallelImportLearnMore = EditorGUIUtility.TrTextContent("Learn more...", "During an asset database refresh some asset imports can be performed in parallel in sub processes.");
+            public static GUIContent desiredImportWorkerCountOverride = EditorGUIUtility.TrTextContent("Override Desired Worker Count", "Override the desired worker count specified in the preferences.");
+            public static GUIContent desiredImportWorkerCount = EditorGUIUtility.TrTextContent("Desired Import Worker Count", "The desired number of import worker processes to use for importing. The actual number of worker processes on the system can be both lower or higher that this, but the system will seek towards this number when importing.");
+            public static GUIContent standbyImportWorkerCount = EditorGUIUtility.TrTextContent("Standby Import Worker Count", "The number of import worker processes to keep around in standby and ready for importing. The actual number of worker processes on the system can be both lower or higher that this, but the system will seek towards this number when worker processes are idle.");
+            public static GUIContent idleWorkerShutdownDelay = EditorGUIUtility.TrTextContent("Idle Import Worker Shutdown Delay", "When an importer worker has been idle for this amount of seconds in will be shutdown unless it would take the worker count below the standby worker count setting.");
 
             public static GUIContent cacheServer = EditorGUIUtility.TrTextContent("Cache Server (project specific)");
-            public static GUIContent assetPipeline = EditorGUIUtility.TrTextContent("Asset Pipeline (project specific)");
+            public static GUIContent assetPipeline = EditorGUIUtility.TrTextContent("Asset Pipeline");
             public static GUIContent artifactGarbageCollection = EditorGUIUtility.TrTextContent("Remove unused Artifacts on Restart", "By default, when you start the Editor, Unity removes unused artifact files in the Library folder, and removes their entries in the asset database. This is a form of \"garbage collection\". This setting allows you to turn off the asset database garbage collection, so that previous artifact revisions which are no longer used are still preserved after restarting the Editor. This is useful if you need to debug unexpected import results.");
             public static GUIContent cacheServerIPLabel = EditorGUIUtility.TrTextContent("IP address");
             public static GUIContent cacheServerNamespacePrefixLabel = EditorGUIUtility.TrTextContent("Namespace prefix", "The namespace used for looking up and storing values on the cache server");
@@ -258,6 +261,8 @@ public PopupElement(string id, string content)
         bool m_IsGlobalSettings;
 
         const string kRefreshImportModeKeyArgs = "-refreshImportMode";
+        const string kStandbyWorkerCountKeyArgs = "-standbyWorkerCount";
+        const string kIdleWorkerShutdownDelayKeyArgs = "-idleWorkerShutdownDelay";
         const string kDesiredImportWorkerCountKeyArgs = "-desiredWorkerCount";
 
         enum CacheServerConnectionState { Unknown, Success, Failure }
@@ -443,8 +448,6 @@ public override void OnInspectorGUI()
 
                 DoCacheServerSettings();
 
-                DoRefreshModeSettings();
-
                 GUI.enabled = wasEnabled;
             }
 
@@ -621,13 +624,93 @@ private bool DoTextureCompressorSettings()
 
         private void DoAssetPipelineSettings()
         {
+            GUILayout.Space(10);
+
             GUILayout.Label(Content.assetPipeline, EditorStyles.boldLabel);
 
             EditorGUI.BeginChangeCheck();
             bool enableArtifactGarbageCollection = EditorUserSettings.artifactGarbageCollection;
             enableArtifactGarbageCollection = EditorGUILayout.Toggle(Content.artifactGarbageCollection, enableArtifactGarbageCollection);
             if (EditorGUI.EndChangeCheck())
                 EditorUserSettings.artifactGarbageCollection = enableArtifactGarbageCollection;
+
+            var overrideMode = GetCommandLineOverride(kRefreshImportModeKeyArgs);
+            if (overrideMode != null)
+            {
+                EditorGUILayout.HelpBox($"Refresh Import mode forced to {overrideMode} via command line argument. To use the mode specified here please restart Unity without the -refreshImportMode command line argument.", MessageType.Info, true);
+            }
+
+            using (new EditorGUI.DisabledScope(overrideMode != null))
+            {
+                GUILayout.BeginHorizontal();
+                    var refreshMode = EditorSettings.refreshImportMode;
+                    var parallelImportEnabledOld = refreshMode == AssetDatabase.RefreshImportMode.OutOfProcessPerQueue;
+                    var parallelImportEnabledNew = EditorGUILayout.Toggle(Content.parallelImport, parallelImportEnabledOld);
+
+                    if (parallelImportEnabledOld != parallelImportEnabledNew)
+                        EditorSettings.refreshImportMode = parallelImportEnabledNew ? AssetDatabase.RefreshImportMode.OutOfProcessPerQueue : AssetDatabase.RefreshImportMode.InProcess;
+                    if (GUILayout.Button(Content.parallelImportLearnMore, EditorStyles.linkLabel))
+                        Application.OpenURL("https://docs.unity3d.com/Manual/ParallelImport.html");
+                GUILayout.EndHorizontal();
+            }
+
+            var overrideDesiredCount = GetCommandLineOverride(kDesiredImportWorkerCountKeyArgs);
+            if (overrideDesiredCount != null)
+            {
+                EditorGUILayout.HelpBox($"Desired import worker count forced to {overrideDesiredCount} via command line argument. To use the worker count specified here please restart Unity without the -desiredWorkerCount command line argument.", MessageType.Info, true);
+            }
+
+            // This min/max worker count is enforced here and in EditorUserSettings.cpp
+            // Please keep them in sync.
+            const int minWorkerCount = 1;
+            const int maxWorkerCount = 128;
+
+            using (new EditorGUI.DisabledScope(overrideDesiredCount != null))
+            {
+                var oldCount = EditorUserSettings.desiredImportWorkerCount;
+                int newCount = EditorGUILayout.IntField(Content.desiredImportWorkerCount, oldCount);
+                newCount = Mathf.Clamp(newCount, minWorkerCount, maxWorkerCount);
+
+                if (oldCount != newCount)
+                    EditorUserSettings.desiredImportWorkerCount = newCount;
+            }
+
+            var overrideStandbyCount = GetCommandLineOverride(kStandbyWorkerCountKeyArgs);
+            if (overrideStandbyCount != null)
+            {
+                EditorGUILayout.HelpBox($"Standby import worker count forced to {overrideStandbyCount} via command line argument. To use the standby worker count specified here please restart Unity without the -standbyWorkerCount command line argument.", MessageType.Info, true);
+            }
+
+            using (new EditorGUI.DisabledScope(overrideStandbyCount != null))
+            {
+                var oldCount = EditorUserSettings.standbyImportWorkerCount;
+                var newCount = EditorGUILayout.IntField(Content.standbyImportWorkerCount, oldCount);
+                int desiredWorkerCount = EditorUserSettings.desiredImportWorkerCount;
+                newCount = Mathf.Clamp(newCount, 0, desiredWorkerCount);
+
+                if (oldCount != newCount)
+                {
+                    EditorUserSettings.standbyImportWorkerCount = newCount;
+                }
+            }
+
+            var overridekIdleWorkerShutdownDelay = GetCommandLineOverride(kIdleWorkerShutdownDelayKeyArgs);
+            if (overridekIdleWorkerShutdownDelay != null)
+            {
+                EditorGUILayout.HelpBox($"Idle import worker shutdown delay forced to {overrideStandbyCount} ms. via command line argument. To use the settings specified here please restart Unity without the -idleWorkerShutdownDelay command line argument.", MessageType.Info, true);
+            }
+
+            using (new EditorGUI.DisabledScope(overridekIdleWorkerShutdownDelay != null))
+            {
+                var oldSeconds = EditorUserSettings.idleImportWorkerShutdownDelayMilliseconds / 1000.0f;
+                var newSeconds = EditorGUILayout.FloatField(Content.idleWorkerShutdownDelay, oldSeconds);
+                newSeconds = Mathf.Max(0, newSeconds);
+
+                if (oldSeconds != newSeconds)
+                {
+                    EditorUserSettings.idleImportWorkerShutdownDelayMilliseconds = (int)(newSeconds * 1000.0f);
+                }
+            }
         }
 
         private void DoCacheServerSettings()
@@ -770,42 +853,6 @@ private static string GetCommandLineOverride(string key)
             return address;
         }
 
-        private void DoRefreshModeSettings()
-        {
-            Assert.IsTrue(m_IsGlobalSettings);
-            GUILayout.Space(10);
-
-            GUILayout.Label(Content.refresh, EditorStyles.boldLabel);
-
-            var overrideMode = GetCommandLineOverride(kRefreshImportModeKeyArgs);
-            if (overrideMode != null)
-            {
-                EditorGUILayout.HelpBox($"Refresh Import mode to {overrideMode} via command line argument. To use the mode specified here please restart Unity without the -refreshImportMode command line argument.", MessageType.Info, true);
-            }
-
-            int index = Mathf.Clamp((int)EditorSettings.refreshImportMode, 0, refreshImportModePopupList.Length - 1);
-            CreatePopupMenu(serializedObject, Content.refreshImportMode, refreshImportModePopupList[index].content, refreshImportModePopupList, index, SetRefreshImportMode);
-
-            var overrideCount = GetCommandLineOverride(kDesiredImportWorkerCountKeyArgs);
-            if (overrideCount != null)
-            {
-                EditorGUILayout.HelpBox($"Desired import worker count forced to {overrideCount} via command line argument. To use the worker count specified here please restart Unity without the -desiredWorkerCount command line argument.", MessageType.Info, true);
-            }
-
-            var oldCount = EditorUserSettings.desiredImportWorkerCount;
-            var newCount = EditorGUILayout.IntField(Content.desiredImportWorkerCount, oldCount);
-
-            // This max worker count is enforced here and in EditorUserSettings.cpp
-            // Please keep them in sync.
-            const int maxWorkerCount = 128;
-
-            newCount = Mathf.Clamp(newCount, 0, maxWorkerCount);
-            if (oldCount != newCount)
-            {
-                EditorUserSettings.desiredImportWorkerCount = newCount;
-            }
-        }
-
         private void DoLineEndingsSettings()
         {
             GUILayout.Space(10);

Editor/Mono/Inspector/MemorySettingsEditor.cs

@@ -15,7 +15,6 @@
 namespace UnityEditor
 {
     [CustomEditor(typeof(MemorySettings))]
-    [ExcludeFromPreset]
     internal class MemorySettingsEditor : Editor
     {
         class Content

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -144,6 +144,7 @@ class SettingsContent
             public static readonly GUIContent mTRendering = EditorGUIUtility.TrTextContent("Multithreaded Rendering*");
             public static readonly GUIContent staticBatching = EditorGUIUtility.TrTextContent("Static Batching");
             public static readonly GUIContent dynamicBatching = EditorGUIUtility.TrTextContent("Dynamic Batching");
+            public static readonly GUIContent spriteBatchingVertexThreshold = EditorGUIUtility.TrTextContent("Sprite Batching Threshold", "Dynamic Batching is always enabled for Sprites and this controls max vertex threshold for batching. ");
             public static readonly GUIContent graphicsJobsNonExperimental = EditorGUIUtility.TrTextContent("Graphics Jobs");
             public static readonly GUIContent graphicsJobsExperimental = EditorGUIUtility.TrTextContent("Graphics Jobs (Experimental)");
             public static readonly GUIContent graphicsJobsMode = EditorGUIUtility.TrTextContent("Graphics Jobs Mode");
@@ -1777,6 +1778,12 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                         PlayerSettings.SetBatchingForPlatform(platform.defaultTarget, staticBatching, dynamicBatching);
                     }
                 }
+
+                int spriteVertexBatchingThreshold = PlayerSettings.spriteBatchVertexThreshold;
+                EditorGUI.BeginChangeCheck();
+                spriteVertexBatchingThreshold = EditorGUILayout.IntSlider(SettingsContent.spriteBatchingVertexThreshold, spriteVertexBatchingThreshold, 300, 8000);
+                if (EditorGUI.EndChangeCheck())
+                    PlayerSettings.spriteBatchVertexThreshold = spriteVertexBatchingThreshold;
             }
 
             bool hdrDisplaySupported = false;

Editor/Mono/Inspector/PreviewRenderUtility.cs

@@ -91,6 +91,7 @@ public class PreviewRenderUtility
         private SavedRenderTargetState m_SavedState;
         private bool m_PixelPerfect;
         private Material m_InvisibleMaterial;
+        private bool m_previewOpened;
 
         private string m_Type;
 
@@ -144,6 +145,8 @@ public PreviewRenderUtility()
                     }
                 }
             }
+
+            m_previewOpened = false;
         }
 
         ~PreviewRenderUtility()
@@ -211,6 +214,12 @@ internal PreviewScene previewScene
 
         public void Cleanup()
         {
+            if (m_previewOpened)
+            {
+                Debug.LogError("Missing EndPreview() before cleanup of PreviewRenderUtility");
+                EndPreview();
+            }
+
             if (m_RenderTexture)
             {
                 Object.DestroyImmediate(m_RenderTexture);
@@ -229,6 +238,14 @@ public void Cleanup()
 
         public void BeginPreview(Rect r, GUIStyle previewBackground)
         {
+            if(m_previewOpened)
+            {
+                Debug.LogError("Previous PreviewRenderUtility.BeginPreview() was not closed with PreviewRenderUtility.EndPreview()");
+                return;
+            }
+
+            m_previewOpened = true;
+
             Texture defaultEnvTexture = ReflectionProbe.defaultTexture;
 
             if (Unsupported.SetOverrideLightingSettings(previewScene.scene))
@@ -360,6 +377,7 @@ public Texture EndPreview()
 
             m_SavedState.Restore();
             FinishFrame();
+            m_previewOpened = false;
             return m_RenderTexture;
         }
 

Editor/Mono/PlayerSettings.bindings.cs

@@ -626,6 +626,9 @@ public static extern bool openGLRequireES32
             set;
         }
 
+        // Set Maximum Vertex Threshold for Sprite Batching.
+        public static extern int spriteBatchVertexThreshold { get; set; }
+
         // The image to display in the Resolution Dialog window.
         [Obsolete("resolutionDialogBanner has been removed.", false)]
         public static extern Texture2D resolutionDialogBanner { get; set; }