Unity 2023.1.0a14 C# reference source code

Author: Unity Technologies

Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs

@@ -65,6 +65,7 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
                 }
             }
 
+            HierarchyProperty propertyWithFilter = null;
             foreach (var folderPath in folders)
             {
                 var sanitizedFolderPath = folderPath.ConvertSeparatorsToUnity().TrimTrailingSlashes();
@@ -86,7 +87,14 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
                 if (property.Find(folderInstanceID, null))
                 {
                     // Set filter after we found the folder
-                    property.SetSearchFilter(searchFilter);
+                    if (propertyWithFilter != null)
+                        propertyWithFilter.CopySearchFilterFrom(property);
+                    else
+                    {
+                        property.SetSearchFilter(searchFilter);
+                        propertyWithFilter = property;
+                    }
+
                     int folderDepth = property.depth;
                     int[] expanded = null; // enter all children of folder
                     while (property.NextWithDepthCheck(expanded, folderDepth + 1))
@@ -118,10 +126,16 @@ private static IEnumerator<T> FindEverywhere<T>(SearchFilter searchFilter, Func<
                     rootPaths.Add(package.assetPath);
                 }
             }
+
+            HierarchyProperty lastProperty = null;
             foreach (var rootPath in rootPaths)
             {
                 var property = new HierarchyProperty(rootPath);
-                property.SetSearchFilter(searchFilter);
+                if (lastProperty != null)
+                    property.CopySearchFilterFrom(lastProperty);
+                else
+                    property.SetSearchFilter(searchFilter);
+                lastProperty = property;
                 while (property.Next(null))
                 {
                     yield return selector(property);

Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs

@@ -55,7 +55,7 @@ public extern bool isV8
 
 
         /////////////////////////////////////////////////////////////////////////////
-        // Common material properties
+        // Material properties
 
         public extern Color mainColor { get; set; }
 
@@ -71,6 +71,24 @@ public extern bool isV8
 
         public extern Color hueVariation { get; set; }
         public extern float alphaTestRef { get; set; }
+        public extern bool enableBumpByDefault { get; set; }
+        public extern bool enableHueByDefault { get; set; }
+        public extern bool enableSubsurfaceByDefault { get; set; }
+
+        /////////////////////////////////////////////////////////////////////////////
+        // Lighting properties
+
+        public extern bool castShadowsByDefault { get; set; }
+        public extern bool receiveShadowsByDefault { get; set; }
+        public extern bool useLightProbesByDefault { get; set; }
+        public extern int reflectionProbeUsagesByDefault { get; set; }
+
+        /////////////////////////////////////////////////////////////////////////////
+        // Wind properties
+
+        public static readonly string[] windQualityNames = new[] { "None", "Fastest", "Fast", "Better", "Best", "Palm" };
+        public extern int bestWindQuality { get; }
+        public extern int selectedWindQuality { get; set; }
 
 
         /////////////////////////////////////////////////////////////////////////////
@@ -82,11 +100,21 @@ public extern bool hasBillboard
             get;
         }
 
+
         public extern bool enableSmoothLODTransition { get; set; }
         public extern bool animateCrossFading { get; set; }
         public extern float billboardTransitionCrossFadeWidth { get; set; }
         public extern float fadeOutWidth { get; set; }
 
+        public extern bool[] enableSettingOverride
+        {
+            [FreeFunction(Name = "SpeedTreeImporterBindings::GetEnableSettingOverride", HasExplicitThis = true)]
+            get;
+            [NativeThrows]
+            [FreeFunction(Name = "SpeedTreeImporterBindings::SetEnableSettingOverride", HasExplicitThis = true)]
+            set;
+        }
+
         public extern float[] LODHeights
         {
             [FreeFunction(Name = "SpeedTreeImporterBindings::GetLODHeights", HasExplicitThis = true)]
@@ -159,10 +187,6 @@ public extern bool[] enableSubsurface
             set;
         }
 
-        public static readonly string[] windQualityNames = new[] { "None", "Fastest", "Fast", "Better", "Best", "Palm" };
-
-        public extern int bestWindQuality { get; }
-
         public extern int[] windQualities
         {
             [FreeFunction(Name = "SpeedTreeImporterBindings::GetWindQuality", HasExplicitThis = true)]

Editor/Mono/EditorGUIUtility.bindings.cs

@@ -204,6 +204,6 @@ [ExcludeFromDocs] public SessionState() {}
         public static extern void EraseVector3(string key);
         public static extern void EraseIntArray(string key);
         public static extern void SetIntArray(string key, int[] value);
-        public static extern int[] GetIntArray(string key, int[] defaultValue);
+        public static extern int[] GetIntArray(string key, [Unmarshalled]int[] defaultValue);
     }
 }

Editor/Mono/EditorMode/ModeService.cs

@@ -38,7 +38,8 @@ internal enum ModeCapability
         StatusBarExtraFeatures,
         SafeMode,
         Remember,
-        AllowAssetCreation
+        AllowAssetCreation,
+        SearchPopupButton
     }
 
     [Serializable]

Editor/Mono/EditorSceneManager.bindings.cs

@@ -203,7 +203,7 @@ internal static void RemapAssetReferencesInScene(UnityEngine.SceneManagement.Sce
         [NativeThrows]
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
         [NativeMethod("SaveScenes")]
-        public extern static bool SaveScenes(Scene[] scenes);
+        public extern static bool SaveScenes([NotNull("NullReferenceException")] Scene[] scenes);
 
         [NativeThrows]
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
@@ -213,7 +213,7 @@ internal static void RemapAssetReferencesInScene(UnityEngine.SceneManagement.Sce
         [NativeThrows]
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
         [NativeMethod("SaveModifiedScenesIfUserWantsTo")]
-        public extern static bool SaveModifiedScenesIfUserWantsTo(Scene[] scenes);
+        public extern static bool SaveModifiedScenesIfUserWantsTo([NotNull("NullReferenceException")] Scene[] scenes);
 
         [StaticAccessor("GetSceneManager()", StaticAccessorType.Dot)]
         [NativeMethod("EnsureUntitledSceneHasBeenSaved")]

Editor/Mono/GameView/GameView.cs

@@ -774,7 +774,7 @@ private void DoToolbarGUI()
                 }
 
                 if (GUILayout.Button(Styles.frameDebuggerContent, EditorStyles.toolbarButton))
-                    FrameDebuggerWindow.ShowFrameDebuggerWindow();
+                    FrameDebuggerWindow.OpenWindowAndToggleEnabled();
 
                 if (RenderDoc.IsLoaded())
                 {

Editor/Mono/HierarchyProperty.bindings.cs

@@ -153,7 +153,9 @@ void Dispose()
         public extern int colorCode { get; }
 
         [FreeFunction("HierarchyPropertyBindings::IsExpanded", HasExplicitThis = true)]
-        public extern bool IsExpanded(int[] expanded);
+        private extern bool IsExpanded_internal(int[] expanded, bool nonNullEmptyArray);
+
+        public bool IsExpanded(int[] expanded) => IsExpanded_internal(expanded, expanded != null && expanded.Length == 0);
 
         public extern string guid { [FreeFunction("HierarchyPropertyBindings::GetGuid", HasExplicitThis = true)] get; }
         public extern bool alphaSorted { [NativeName("IsAlphaSorted")] get; set; }
@@ -167,18 +169,24 @@ void Dispose()
         public extern GUID[] dynamicDependencies { get; }
 
         [FreeFunction("HierarchyPropertyBindings::Next", HasExplicitThis = true)]
-        public extern bool Next(int[] expanded);
+        private extern bool Next_internal(int[] expanded, bool nonNullEmptyArray);
+        public bool Next(int[] expanded) => Next_internal(expanded, expanded != null && expanded.Length == 0);
         [FreeFunction("HierarchyPropertyBindings::NextWithDepthCheck", HasExplicitThis = true)]
-        public extern bool NextWithDepthCheck(int[] expanded, int minDepth);
+        private extern bool NextWithDepthCheck_internal(int[] expanded, int minDepth, bool nonNullEmptyArray);
+        public bool NextWithDepthCheck(int[] expanded, int minDepth) => NextWithDepthCheck_internal(expanded, minDepth, expanded != null && expanded.Length == 0);
         [FreeFunction("HierarchyPropertyBindings::Previous", HasExplicitThis = true)]
-        public extern bool Previous(int[] expanded);
+        private extern bool Previous_internal(int[] expanded, bool nonNullEmptyArray);
+        public bool Previous(int[] expanded) => Previous_internal(expanded, expanded != null && expanded.Length == 0);
         public extern bool Parent();
         [FreeFunction("HierarchyPropertyBindings::Find", HasExplicitThis = true)]
-        public extern bool Find(int instanceID, int[] expanded);
+        private extern bool Find_internal(int instanceID, int[] expanded, bool nonNullEmptyArray);
+        public bool Find(int instanceID, int[] expanded) => Find_internal(instanceID, expanded, expanded != null && expanded.Length == 0);
         [FreeFunction("HierarchyPropertyBindings::Skip", HasExplicitThis = true)]
-        public extern bool Skip(int count, int[] expanded);
+        private extern bool Skip_internal(int count, int[] expanded, bool nonNullEmptyArray);
+        public bool Skip(int count, int[] expanded) =>Skip_internal(count, expanded, expanded != null && expanded.Length == 0);
         [FreeFunction("HierarchyPropertyBindings::CountRemaining", HasExplicitThis = true)]
-        public extern int CountRemaining(int[] expanded);
+        private extern int CountRemaining_internal(int[] expanded, bool nonNullEmptyArray);
+        public int CountRemaining(int[] expanded) => CountRemaining_internal(expanded, expanded != null && expanded.Length == 0);
 
         public extern int GetInstanceIDIfImported();
 
@@ -205,8 +213,19 @@ internal void SetSearchFilter(SearchFilter filter)
             SetSearchFilterImpl(SearchFilter.Split(filter.nameFilter), filter.classNames, filter.assetLabels, filter.assetBundleNames, filter.versionControlStates, filter.softLockControlStates, filter.referencingInstanceIDs, filter.sceneHandles, filter.GlobToRegex().ToArray(), filter.productIds, filter.anyWithAssetOrigin, filter.showAllHits, filter.importLogFlags);
         }
 
+        internal void CopySearchFilterFrom(HierarchyProperty other)
+        {
+            if (other == null)
+                throw new ArgumentNullException(nameof(other));
+            CopySearchFilterImpl(other);
+        }
+
         [FreeFunction("HierarchyPropertyBindings::SetSearchFilterImpl", HasExplicitThis = true)]
         extern void SetSearchFilterImpl(string[] nameFilters, string[] classNames, string[] assetLabels, string[] assetBundleNames, string[] versionControlStates, string[] softLockControlStates, int[] referencingInstanceIDs, int[] sceneHandles, string[] regex, int[] productIds, bool anyWithAssetOrigin, bool showAllHits, ImportLogFlags importLogFlags);
+
+        [FreeFunction("HierarchyPropertyBindings::CopySearchFilterImpl", HasExplicitThis = true)]
+        extern void CopySearchFilterImpl(HierarchyProperty other);
+
         [FreeFunction("HierarchyPropertyBindings::FindAllAncestors", HasExplicitThis = true)]
         public extern int[] FindAllAncestors(int[] instanceIDs);
         [FreeFunction("HierarchyPropertyBindings::ClearSceneObjectsFilter")]

Editor/Mono/ImportSettings/SpeedTreeImporterMaterialEditor.cs

@@ -33,7 +33,7 @@ private static class Styles
             public static GUIContent InternalMaterialHelp = EditorGUIUtility.TrTextContent("Materials are embedded inside the imported asset.");
             public static GUIContent MaterialAssignmentsHelp = EditorGUIUtility.TrTextContent("Material assignments can be remapped below.");
 
-            public static GUIContent ExternalMaterialSearchHelp = EditorGUIUtility.TrTextContent("Remap the imported materials to materials from the Unity project.");
+            public static GUIContent ExternalMaterialSearchHelp = EditorGUIUtility.TrTextContent("Searches the user provided directory and matches the materials that share the same name and LOD with the originally imported material.");
 
             public static GUIContent SelectMaterialFolder = EditorGUIUtility.TrTextContent("Select Materials Folder");
         }