Skip to content

Merge batch mode #542

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 1 commit into from
May 18, 2020
Merged

Merge batch mode #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void RegisterUpgraderReimport()
{
string commandLineOptions = System.Environment.CommandLine;
bool inTestSuite = commandLineOptions.Contains("-testResults");
if (!inTestSuite && fileExist)
if (!inTestSuite && fileExist && !Application.isBatchMode)
{
EditorUtility.DisplayDialog("HDRP Material upgrade", "The Materials in your Project were created using an older version of the High Definition Render Pipeline (HDRP)." +
" Unity must upgrade them to be compatible with your current version of HDRP. \n" +
Expand Down
10 changes: 8 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,15 @@ static void GetAllValidHDRPAssets()
}

// Prompt a warning if we find 0 HDRP Assets.
if (_hdrpAssets.Count == 0)
if (_hdrpAssets.Count == 0 && !Application.isBatchMode)
{
if (EditorUtility.DisplayDialog("HDRP Asset missing", "No HDRP Asset has been set in the Graphic Settings, and no potential used in the build HDRP Asset has been found. If you want to continue compiling, this might lead to VERY long compilation time.", "Ok", "Cancel"))
throw new UnityEditor.Build.BuildFailedException("Build canceled");
throw new UnityEditor.Build.BuildFailedException("Build canceled");
}
else
{
Debug.LogWarning("There is no HDRP Asset provided in GraphicsSettings. Build time can be extremely long without it.");
}

/*
Debug.Log(string.Format("{0} HDRP assets in build:{1}",
Expand Down