diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs index 512805d..c963fd7 100644 --- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs +++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs @@ -289,12 +289,13 @@ namespace XericUI.ShaderBake.Editor private void BindSections() { - Collapsible("sec-source", "sec-source-body"); - Collapsible("sec-output", "sec-output-body"); - Collapsible("sec-surface", "sec-surface-body"); - Collapsible("sec-camera", "sec-camera-body"); - Collapsible("sec-globals", "sec-globals-body"); - Collapsible("sec-props", "sec-props-body"); + // 头部是 Toggle(名字带 -head),外层同名容器只是分组壳,别拿它去 Q + Collapsible("sec-source-head", "sec-source-body"); + Collapsible("sec-output-head", "sec-output-body"); + Collapsible("sec-surface-head", "sec-surface-body"); + Collapsible("sec-camera-head", "sec-camera-body"); + Collapsible("sec-globals-head", "sec-globals-body"); + Collapsible("sec-props-head", "sec-props-body"); } private void Collapsible(string headName, string bodyName) diff --git a/Runtime/ShaderBake/ShaderBakeRenderer.cs b/Runtime/ShaderBake/ShaderBakeRenderer.cs index c63349c..1ed9c2b 100644 --- a/Runtime/ShaderBake/ShaderBakeRenderer.cs +++ b/Runtime/ShaderBake/ShaderBakeRenderer.cs @@ -408,8 +408,16 @@ namespace XericUI.ShaderBake { if (m_Buffer != null) { - m_Buffer.Release(); - m_Buffer.Dispose(); + // 只 Dispose:Dispose 内部已经 Release,再单独 Release 一次会二次释放, + // 2021.3 上表现为关闭窗口时抛 _unity_self 为空的 ArgumentNullException + try + { + m_Buffer.Dispose(); + } + catch (Exception) + { + // 退出编辑器/域重载期间原生对象可能已被回收,这时再报错没有意义 + } m_Buffer = null; } ReleaseTempObject(m_MultiSampleSource, immediate);