Skip to content

[8.x.x] Fixing an API breakage regarding isSceneViewCamera. #323

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 3 commits into from
Apr 29, 2020
Merged

[8.x.x] Fixing an API breakage regarding isSceneViewCamera. #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba4d4b6
Fixing an API breakage regarding isSceneViewCamera.
ellioman Apr 29, 2020
e9e4123
Changelog fix
ellioman Apr 29, 2020
6399b1d
Rider added using UnityEditor. Removing it [cancel old ci]
ellioman Apr 29, 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
3 changes: 0 additions & 3 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 @@ -6,9 +6,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed
- Setting the renderingData.cameraData.isSceneCamera is now marked as obsolete and replaced by renderingData.cameraData.cameraType.

### Fixed
- Fixed an issue where grid lines were being drawn on top of opaque objects in the preview window [case 1240723](https://issuetracker.unity3d.com/issues/urp-grid-is-rendered-in-front-of-the-model-in-the-inspector-animation-preview-window-when-depth-or-opaque-texture-is-enabled)
- Fixed an issue where objects in the preview window were being affected by layer mask settings in the default renderer [case 1204376](https://issuetracker.unity3d.com/issues/urp-prefab-preview-is-blank-when-a-custom-forward-renderer-data-and-default-layer-mask-is-mixed-are-used)
Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ static void InitializeStackedCameraData(Camera baseCamera, UniversalAdditionalCa
cameraData.targetTexture = baseCamera.targetTexture;
cameraData.isStereoEnabled = IsStereoEnabled(baseCamera);
cameraData.cameraType = baseCamera.cameraType;
cameraData.isSceneViewCamera = cameraData.cameraType == CameraType.SceneView;
cameraData.numberOfXRPasses = 1;
cameraData.isXRMultipass = false;

Expand Down
6 changes: 1 addition & 5 deletions com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ public Matrix4x4 GetGPUProjectionMatrix()
/// <summary>
/// True if the camera rendering is for the scene window in the editor
/// </summary>
public bool isSceneViewCamera
{
get => cameraType == CameraType.SceneView;
set { Debug.LogWarning("Setting isSceneViewCamera is an invalid operation. Please use cameraType instead."); }
}
public bool isSceneViewCamera;

/// <summary>
/// True if the camera rendering is for the preview window in the editor
Expand Down