Skip to content

fix for freeze in renderpipeline converter #6015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 26, 2021
Merged

fix for freeze in renderpipeline converter #6015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a970a88
fix for freeze in renderpipeline converter
martint-unity Oct 14, 2021
7fa866e
updated changelog
martint-unity Oct 14, 2021
15dcb90
Merge branch 'master' into universal/converter/fix-for-freeze-in-rend…
martint-unity Oct 25, 2021
1c08667
Update CHANGELOG.md
martint-unity Oct 25, 2021
cc24399
Merge branch 'universal/staging' into universal/converter/fix-for-fre…
phi-lira Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.universal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fix for rendering thumbnails. [case 1348209](https://issuetracker.unity3d.com/issues/preview-of-assets-do-not-show-in-the-project-window)
- Fixed a regression bug where XR camera postion can not be modified in beginCameraRendering [case 1365000]
- Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package)
- Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)
- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties)
- Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)

Expand All @@ -49,7 +50,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed the LensFlare flicker with TAA on SceneView (case 1356734).
- Fixed an issue where Unlit and ParticlesUnlit shaders did not have HDR color selection for albedo [case 1283767](https://issuetracker.unity3d.com/issues/built-in-unlit-particle-shader-has-hdr-color-selection-for-albedo-urp-unlit-particles-do-not)


## [13.0.0] - 2021-09-01
### Added
- URP global setting for stripping post processing shader variants.
Expand Down
2 changes: 0 additions & 2 deletions com.unity.render-pipelines.universal/Editor/Converter/RenderPipelineConvertersEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ void Convert(ClickEvent evt)
int activeConvertersCount = activeConverterStates.Count;
foreach (ConverterState activeConverterState in activeConverterStates)
{
AssetDatabase.StartAssetEditing();
currentCount++;
var index = activeConverterState.index;
m_CoreConvertersList[index].OnPreRun();
Expand All @@ -680,7 +679,6 @@ void Convert(ClickEvent evt)
}
m_CoreConvertersList[index].OnPostRun();
AssetDatabase.SaveAssets();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick question, why is SaveAssets done in the foreach loop and not just one time after every possible conversion is done?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we added it here because then we know that things are saved between different converters.

AssetDatabase.StopAssetEditing();
EditorUtility.ClearProgressBar();
}

Expand Down