Skip to content

[Backport 10.x.x] #2514 #2534

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 2 commits into from
Nov 5, 2020
Merged

[Backport 10.x.x] #2514 #2534

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
38f5fb1
[Universal|Bugfix] Camera inspector requests current URP asset (#2514)
Verasl Nov 4, 2020
c9d2f5e
Merge branch '10.x.x/release' into 10.x.x/universal/backport-2514
phi-lira Nov 5, 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
2 changes: 2 additions & 0 deletions 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,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed XR camera fov can be changed through camera inspector.
- Fixed LightProbes to have gamma correct when using gamma color space. [case 1268911](https://issuetracker.unity3d.com/issues/urp-has-no-gamma-correction-for-lightprobes)
- Fixed an issue causing materials to be upgraded multiple times.
- Fixed an issue where the Camera inspector was grabbing the URP asset in Graphics Settings rather than the currently active.
- Fixed an issue where the Light Explorer was grabbing the URP asset in Graphics Settings rather than the currently active.

## [10.1.0] - 2020-10-12
### Added
Expand Down
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineCameraEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ BackgroundType GetBackgroundType(CameraClearFlags clearFlags)

public override void OnInspectorGUI()
{
var rpAsset = GraphicsSettings.renderPipelineAsset as UniversalRenderPipelineAsset;
var rpAsset = UniversalRenderPipeline.asset;
if(rpAsset == null)
{
base.OnInspectorGUI();
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineLightEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ void DrawAdditionalShadowData()
lightProperty.gameObject.AddComponent<UniversalAdditionalLightData>();
m_AdditionalLightData = lightProperty.gameObject.GetComponent<UniversalAdditionalLightData>();

UniversalRenderPipelineAsset asset = GraphicsSettings.renderPipelineAsset as UniversalRenderPipelineAsset;
var asset = UniversalRenderPipeline.asset;
settings.shadowsBias.floatValue = asset.shadowDepthBias;
settings.shadowsNormalBias.floatValue = asset.shadowNormalBias;

Expand Down Expand Up @@ -371,7 +371,7 @@ protected override void OnSceneGUI()
CoreLightEditorUtilities.DrawDirectionalLightGizmo(light);
}
break;

default:
base.OnSceneGUI();
break;
Expand Down