Skip to content
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

Jump to bottom

Hd/fix wizard defaultvolumeprofile creation #565

Merged
merged 2 commits into from
May 22, 2020
Merged

Hd/fix wizard defaultvolumeprofile creation #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f71b7d
Fix Wizard check on default volume profile
RSlysz May 20, 2020
c9ec590
Update CHANGELOG.md
RSlysz May 20, 2020
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed taaFrameIndex and XR tests 4052 and 4053
- Fixed the prefab integration of custom passes (Prefab Override Highlight not working as expected).
- Cloned volume profile from read only assets are created in the root of the project. (case 1154961)
- Fixed Wizard check on default volume profile to also check it is not the default one in package.

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
18 changes: 16 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/DefaultScene/HDWizard.Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@ bool IsDefaultVolumeProfileAssigned()
return false;

var hdAsset = HDRenderPipeline.currentAsset;
return hdAsset.defaultVolumeProfile != null && !hdAsset.defaultVolumeProfile.Equals(null);
return hdAsset.defaultVolumeProfile != null
&& !hdAsset.defaultVolumeProfile.Equals(null)
&& hdAsset.defaultVolumeProfile != hdAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile;
}
void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused)
{
Expand All @@ -471,7 +473,19 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused)
if (hdrpAsset == null)
return;

EditorDefaultSettings.GetOrAssignDefaultVolumeProfile(hdrpAsset);
VolumeProfile defaultSettingsVolumeProfileInPackage = hdrpAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile;
string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset";

//try load one if one already exist
VolumeProfile defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath<VolumeProfile>(defaultSettingsVolumeProfilePath);
if (defaultSettingsVolumeProfile == null || defaultSettingsVolumeProfile.Equals(null))
{
//else create it
AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(defaultSettingsVolumeProfileInPackage), defaultSettingsVolumeProfilePath);
defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath<VolumeProfile>(defaultSettingsVolumeProfilePath);
}
hdrpAsset.defaultVolumeProfile = defaultSettingsVolumeProfile;

EditorUtility.SetDirty(hdrpAsset);
}

Expand Down
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.high-definition/Editor/DefaultScene/HDWizard.Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT
error: "Default scene prefab must be set to create HD templated scene!");
public static readonly ConfigStyle hdrpVolumeProfile = new ConfigStyle(
label: "Default volume profile",
error: "Default volume profile must be assigned in the HDRP asset!");
error: "Default volume profile must be assigned in the HDRP asset! Also, for it to be editable, it should be outside of package.");

public static readonly ConfigStyle vrLegacyVRSystem = new ConfigStyle(
label: "Legacy VR System",
Expand Down