diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs index 664137243cc..618d21e7b9d 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs @@ -95,12 +95,12 @@ static void CreateAsset(string name, Action callback = null, string exte ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, assetCreationCallback, name, icon, null, false); } - class AssetCreationCallback : ProjectWindowCallback.EndNameEditAction + class AssetCreationCallback : ProjectWindowCallback.AssetCreationEndAction { public Action callback; public string extension; - public override void Action(int instanceId, string pathName, string resourceFile) + public override void Action(EntityId entityId, string pathName, string resourceFile) { string path = AssetDatabase.GenerateUniqueAssetPath(pathName + $".{extension}"); callback?.Invoke(path); diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs index db56c9a4dae..f420824415a 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs @@ -4,6 +4,7 @@ namespace UnityEditor.Rendering.Converter { + [Serializable] internal abstract class AssetsConverter : IRenderPipelineConverter { protected abstract List<(string query, string description)> contextSearchQueriesAndIds { get; } diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterManager.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterManager.cs index 4925143db83..a484518b371 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterManager.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Reflection; +using NUnit.Framework; using UnityEngine; namespace UnityEditor.Rendering.Converter @@ -79,7 +80,14 @@ public void OnBeforeSerialize() public void OnAfterDeserialize() { - + // Something null, remove it + for (int i = converterStates.Count - 1; i >= 0; i--) + { + if (converterStates[i] == null || converterStates[i].converter == null) + { + converterStates.RemoveAt(i); + } + } } } } diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterMaterialUpgrader.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterMaterialUpgrader.cs index a2ac8d2602d..f2b987ba6e1 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterMaterialUpgrader.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterMaterialUpgrader.cs @@ -1,9 +1,11 @@ +using System; using System.Collections.Generic; using System.Text; using UnityEngine; namespace UnityEditor.Rendering.Converter { + [Serializable] internal abstract class RenderPipelineConverterMaterialUpgrader : AssetsConverter { public override bool isEnabled => m_UpgradersCache.Count > 0; diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConverterVisualElement.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConverterVisualElement.cs index 4b4c96cc334..f39d93b84ee 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConverterVisualElement.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConverterVisualElement.cs @@ -27,6 +27,11 @@ internal class RenderPipelineConverterVisualElement : VisualElement public bool isSelectedAndEnabled => converter.isEnabled && state.isSelected; VisualElement m_RootVisualElement; + ListView m_ItemsList; + HeaderFoldout m_HeaderFoldout; + VisualElement m_ListViewHeader; + HelpBox m_NoItemsFound; + HelpBox m_PressScan; Label m_PendingLabel; Label m_WarningLabel; Label m_ErrorLabel; @@ -43,53 +48,26 @@ public RenderPipelineConverterVisualElement(Node converterInfo) s_VisualTreeAsset.Value.CloneTree(m_RootVisualElement); m_RootVisualElement.styleSheets.Add(s_StyleSheet.Value); - m_RootVisualElement.SetEnabled(converter.isEnabled); - m_RootVisualElement.Q