Merge pull request #8292 from Unity-Technologies/internal/master

Internal/master

Author: rolandk-unity

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs

@@ -29,11 +29,13 @@ sealed partial class DebugWindow
         readonly Dictionary<DebugUI.Widget, WidgetSearchData> m_WidgetSearchElementCache = new();
         readonly List<TextElement> m_PanelHeaderTextElements = new();
         UIElementSearchFilter m_SearchFilter;
+        Label m_NoResultsLabel;
 
         void BuildSearchCache()
         {
             m_WidgetSearchElementCache.Clear();
             m_PanelHeaderTextElements.Clear();
+            m_NoResultsLabel = rootVisualElement.Q<Label>(name: "debug-window-no-results-label");
 
             foreach (var panelElement in m_RightPaneElement.Children())
             {
@@ -76,6 +78,9 @@ void InitializeSearchField()
                             tab.style.display = shouldShow ? DisplayStyle.Flex : DisplayStyle.None;
                         }
                     }
+
+                    bool noResults = !string.IsNullOrEmpty(searchString) && visiblePanels.Count == 0;
+                    m_NoResultsLabel.style.display = noResults ? DisplayStyle.Flex : DisplayStyle.None;
                 }
             );
             m_SearchFilter.InitializeSearchField("search-field");

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss

@@ -63,15 +63,41 @@
 
 /* Header Foldout */
 
-.debug-window-foldout > .unity-foldout__toggle {
-    border-width: 1px 0px 1px 0px;
+.debug-window-foldout-header > .unity-foldout__toggle {
+    padding-top: 1px !important;
+    padding-bottom: 1px !important;
     margin-top: 0px !important;
     margin-bottom: 0px !important;
+    margin-left: -2px;
+    margin-right: -4px;
+    border-top-width: 1px;
     border-top-color: var(--unity-colors-default-border);
-    border-bottom-color: var(--unity-colors-inspector_titlebar-border_accent);
+    border-bottom-width: 1px;
+    border-bottom-color: var(--unity-colors-default-border);
     background-color: var(--unity-colors-inspector_titlebar-background);
 }
 
+.debug-window-foldout-header > .unity-foldout__toggle:hover {
+    background-color: var(--unity-colors-inspector_titlebar-background-hover);
+}
+
+.debug-window-foldout-header > .unity-foldout__toggle > .unity-toggle__input > .unity-toggle__checkmark
+{
+    margin-left: 4px;
+    margin-right: 4px;
+}
+
+.debug-window-foldout-header .unity-foldout__text {
+    -unity-font-style: bold;
+}
+
+.debug-window-foldout > .unity-foldout__toggle {
+    padding-top: 1px !important;
+    padding-bottom: 1px !important;
+    margin-top: 0px !important;
+    margin-bottom: 0px !important;
+}
+
 .debug-window-foldout > .unity-foldout__toggle:hover {
     background-color: var(--unity-colors-inspector_titlebar-background-hover);
 }
@@ -82,29 +108,36 @@
     margin-right: 4px;
 }
 
+.debug-window-foldout .unity-foldout__text {
+    -unity-font-style: bold;
+}
+
 .more-options-button {
     background-image: var(--unity-icons-pane_options);
-    background-size: contain;
-    background-repeat: no-repeat;
+}
+
+.info-button,
+.more-options-button {
     background-color: transparent;
-    border-color: transparent;
-    width: 16px;
-    margin: 0px 4px 0px 0px !important;
-    padding: 0px 0px 0px 0px !important;
+    margin: 2px 2px 1px 3px;
+    padding: 0px 2px 0px 0px;
+    border-width: 0px;
+    border-radius: 2px 2px 2px 2px;
+    width: 20px;
+    height: 20px;
 }
 
-.more-options-button:hover {
+.info-button:hover,
+.more-options-button:hover{
     background-color: var(--unity-colors-button-background-hover);
 }
 
-.info-button {
-    background-color: transparent;
-    border-color: transparent;
-    width: 24px;
-    margin: 0px 4px 0px 0px !important;
-    padding: 0px 0px 0px 0px !important;
+.info-button:disabled
+.info-button:disabled,
+.more-options-button:disabled {
 }
 
-.info-button:hover {
-    background-color: var(--unity-colors-button-background-hover);
+#debug-window-no-results-label {
+    display: none;
+    -unity-text-align: middle-center;
 }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml

@@ -15,6 +15,7 @@
         <ui:VisualElement name="debug-window-tab-container" class="">
             <ui:ScrollView horizontal-scroller-visibility="Hidden" view-data-key="debug-window-tab-container-scrollview">
                 <ui:VisualElement name="panels-inspector-insertion-element" />
+                <ui:Label name="debug-window-no-results-label" text="No results match your search." />
                 <ui:VisualElement name="scroll-buffer" />
             </ui:ScrollView>
         </ui:VisualElement>

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs

@@ -892,6 +892,7 @@ static internal void Init()
                 Lightmapping.bakeStarted += OnBakeStarted;
                 Lightmapping.bakeCancelled += OnBakeCancelled;
                 Lightmapping.inputExtraction += OnInputExtraction;
+                AssemblyReloadEvents.beforeAssemblyReload += CleanUp;
             }
         }
 

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs

@@ -1,13 +1,11 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
 using UnityEngine.Rendering.RenderGraphModule;
 
-#if UNITY_EDITOR
-using UnityEditor.Rendering;
-#endif
-
-namespace UnityEngine.Rendering.Tests
+namespace UnityEditor.Rendering.Tests
 {
     // TODO: Move this class to the Tests/Editor folder once the "IsolatedPackagesVerified" CI test correctly resolves all dependencies.
     // Currently, the URP package fails to locate the RenderGraphTestsCore class when it's placed under Tests/Editor,
@@ -130,9 +128,8 @@ public void Setup()
         {
             // Setting default global settings to the custom RG render pipeline type, no quality settings so we can rely on the default RP
             m_RenderGraphTestGlobalSettings = ScriptableObject.CreateInstance<RenderGraphTestGlobalSettings>();
-#if UNITY_EDITOR
             EditorGraphicsSettings.SetRenderPipelineGlobalSettingsAsset<RenderGraphTestPipelineInstance>(m_RenderGraphTestGlobalSettings);
-#endif
+
             // Saving old render pipelines to set them back after testing
             m_OldDefaultRenderPipeline = GraphicsSettings.defaultRenderPipeline;
             m_OldQualityRenderPipeline = QualitySettings.renderPipeline;
@@ -166,14 +163,20 @@ public void Cleanup()
             QualitySettings.renderPipeline = m_OldQualityRenderPipeline;
             m_OldQualityRenderPipeline = null;
 
-            m_RenderGraph.Cleanup();
+            try
+            {
+                m_RenderGraph.Cleanup();
+            }
+            catch (Exception e)
+            {
+                Debug.Log($"Tried to clean RenderGraph but exception was thrown: {e.Message}");
+            }
 
-            Object.DestroyImmediate(m_RenderGraphTestPipeline);
 
-#if UNITY_EDITOR
+            UnityEngine.Object.DestroyImmediate(m_RenderGraphTestPipeline);
             EditorGraphicsSettings.SetRenderPipelineGlobalSettingsAsset<RenderGraphTestPipelineInstance>(null);
-#endif
-            Object.DestroyImmediate(m_RenderGraphTestGlobalSettings);
+
+            UnityEngine.Object.DestroyImmediate(m_RenderGraphTestGlobalSettings);
 
             GameObject.DestroyImmediate(m_GameObject);
             m_GameObject = null;

Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
@@ -40,7 +39,6 @@ static SampleDependencyImporter()
 
     PackageInfo m_PackageInfo;
     SampleList m_SampleList;
-    List<Sample> m_Samples;
 
     VisualElement injectingElement;
     VisualElement _panelRoot;
@@ -100,6 +98,7 @@ internal void RefreshSampleButtons()
 
         var bound = Mathf.Min(sampleContainers.Count, m_SampleList.samples.Length);
 
+        // Foreach sample
         for (int i=0; i<bound; i++)
         {
             // Check if the sample has dependencies, if not just skip the injection.
@@ -155,16 +154,20 @@ internal void RefreshSampleButtons()
 
                 // Need to copy i for the lambda.
                 var index = i;
-                // On click of the imported button, import the dependencies first then call the original button logic.
+                // On click of the imported button, import the dependencies first then use the package manager API to trigger the regular sample import logic.
                 injectedButton.clicked += () =>
                 {
                     ImportSampleDependencies(index);
 
-                    using (var ev = NavigationSubmitEvent.GetPooled())
+                    // After importing the dependencies, we can call the package manager API import logic.
+                    foreach (Sample sample in Sample.FindByPackage(m_PackageInfo.name, m_PackageInfo.version))
                     {
-                        ev.target = importButton;
-                        importButton.SendEvent(ev);
+                        if (sample.displayName == m_SampleList.samples[index].displayName)
+                        {
+                            sample.Import(Sample.ImportOptions.HideImportWindow | Sample.ImportOptions.OverridePreviousImports);
+                        }
                     }
+
                 };
             }
             else // We may need to update the button text after the sample import here.

Packages/com.unity.render-pipelines.core/Editor/Tools/MaterialUpgrader/MaterialUpgrader.Utils.cs

@@ -12,6 +12,8 @@ namespace UnityEditor.Rendering
     /// </summary>
     public partial class MaterialUpgrader
     {
+internal static readonly string k_DialogKey = $"{nameof(UnityEditor)}.{nameof(Rendering)}.{nameof(MaterialUpgrader)}.ConfirmMaterialConversion";
+
         #region Internal API
         /// <summary>
         /// Represents an entry describing material properties
@@ -344,15 +346,15 @@ static void PerformUpgrade(List<MaterialUpgradeEntry> materialUpgrades, List<Mat
 
             bool CanPerformUpgrade()
             {
-                const string title = "Material Upgrader";
-                const string message = "This operation will overwrite existing materials in your project.\n\nPlease ensure you have a backup before proceeding.";
+                const string title = "Confirm Material Conversion";
+                const string message = "This action will modify materials and cannot be easily undone. It is strongly recommended to have a backup or use version control before continuing.";
                 const string proceed = "Proceed";
                 const string cancel = "Cancel";
 
                 if (Application.isBatchMode)
                     return true;
 
-                return EditorUtility.DisplayDialog(title, message, proceed, cancel);
+                return EditorUtility.DisplayDialog(title, message, proceed, cancel, DialogOptOutDecisionType.ForThisMachine, k_DialogKey);
             }
 
             if (CanPerformUpgrade())

Packages/com.unity.render-pipelines.core/Editor/Tools/MaterialUpgrader/MaterialUpgraderEditMenus.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering
+{
+    class MaterialUpgraderEditMenus
+    {
+        private static readonly List<MaterialUpgrader> s_Empty = new List<MaterialUpgrader>();
+
+        public static List<MaterialUpgrader> GetCurrentSRPUpgraders()
+        {
+            if (!GraphicsSettings.isScriptableRenderPipelineEnabled)
+                return s_Empty;
+
+            return MaterialUpgrader.FetchAllUpgradersForPipeline(GraphicsSettings.currentRenderPipelineAssetType);
+        }
+
+        [MenuItem("Edit/Rendering/Materials/Convert All Built-In Materials to Current SRP", true)]
+        internal static bool UpgradeMaterialsProjectValidate()
+        {
+            return GraphicsSettings.isScriptableRenderPipelineEnabled;
+        }
+
+        [MenuItem("Edit/Rendering/Materials/Convert All Built-In Materials to Current SRP", priority = CoreUtils.Priorities.editMenuPriority + 1)]
+        internal static void UpgradeMaterialsProject()
+        {
+            MaterialUpgrader.UpgradeProjectFolder(GetCurrentSRPUpgraders(), "Upgrade to SRP Material");
+        }
+
+        [MenuItem("Edit/Rendering/Materials/Convert Selected Built-In Materials to Current SRP", true)]
+        internal static bool UpgradeMaterialsSelectionValidate()
+        {
+            if (Selection.objects.Length == 0 || !GraphicsSettings.isScriptableRenderPipelineEnabled)
+                return false;
+
+            foreach (var obj in Selection.objects)
+            {
+                if (obj is not Material)
+                    return false;
+            }
+
+            return true;
+        }
+
+        [MenuItem("Edit/Rendering/Materials/Convert Selected Built-In Materials to Current SRP", priority = CoreUtils.Priorities.editMenuPriority + 2)]
+        internal static void UpgradeMaterialsSelection()
+        {
+            MaterialUpgrader.UpgradeSelection(GetCurrentSRPUpgraders(), "Upgrade to SRP Material");
+        }
+    }
+}

Packages/com.unity.render-pipelines.core/Editor/Tools/MaterialUpgrader/MaterialUpgraderEditMenus.cs.meta

@@ -11,7 +11,7 @@ class UIElementSearchFilter
     {
         internal const string k_SelectionColorBeginTag = "<mark=#3169ACAB>";
         internal const string k_SelectionColorEndTag = "</mark>";
-        const int k_SearchStringLimit = 15;
+        const int k_SearchStringLimit = 32;
 
         IVisualElementScheduledItem m_PreviousSearch;
         string m_PendingSearchString;
@@ -28,6 +28,7 @@ public void InitializeSearchField(string searchFieldName)
         {
             var searchField = m_RootElement.Q<ToolbarSearchField>(searchFieldName);
             searchField.placeholderText = L10n.Tr("Search");
+            searchField.Q<TextField>().maxLength = k_SearchStringLimit;
             searchField.RegisterValueChangedCallback(evt => OnSearchFilterChanged(evt.newValue));
 
             // Apply empty search once in case the entire window was reloaded with a non-empty search. Search
@@ -37,13 +38,6 @@ public void InitializeSearchField(string searchFieldName)
 
         void OnSearchFilterChanged(string searchString)
         {
-            // Ensure the search string is within the allowed length limit
-            if (searchString.Length > k_SearchStringLimit)
-            {
-                searchString = searchString[..k_SearchStringLimit];
-                Debug.LogWarning($"Search string limit exceeded: {k_SearchStringLimit}");
-            }
-
             // Sanitize to not match rich text tags
             searchString = searchString.Replace("<", string.Empty).Replace(">", string.Empty);