From ba4d4b643bbb6e10f6682080b54faebb1f970e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Wed, 29 Apr 2020 11:05:55 +0200 Subject: [PATCH 1/3] Fixing an API breakage regarding isSceneViewCamera. --- .../Runtime/UniversalRenderPipeline.cs | 1 + .../Runtime/UniversalRenderPipelineCore.cs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs index c175567faba..d44ab5de148 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs @@ -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; diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 7a4a50f7257..6c01ed4f1f3 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Unity.Collections; +using UnityEditor; using UnityEngine.Scripting.APIUpdating; using UnityEngine.Experimental.GlobalIllumination; @@ -103,11 +104,7 @@ public Matrix4x4 GetGPUProjectionMatrix() /// /// True if the camera rendering is for the scene window in the editor /// - public bool isSceneViewCamera - { - get => cameraType == CameraType.SceneView; - set { Debug.LogWarning("Setting isSceneViewCamera is an invalid operation. Please use cameraType instead."); } - } + public bool isSceneViewCamera; /// /// True if the camera rendering is for the preview window in the editor From e9e41231b6832298935bd27644837847ab9b558b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Wed, 29 Apr 2020 11:17:56 +0200 Subject: [PATCH 2/3] Changelog fix --- com.unity.render-pipelines.universal/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index f018c0c0230..f2c1a76bcc7 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -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) From 6399b1d2e6bf1bbc4a6ef03ca98cd096c4755ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Wed, 29 Apr 2020 12:11:50 +0200 Subject: [PATCH 3/3] Rider added using UnityEditor. Removing it [cancel old ci] --- .../Runtime/UniversalRenderPipelineCore.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 6c01ed4f1f3..25b79956e8a 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Unity.Collections; -using UnityEditor; using UnityEngine.Scripting.APIUpdating; using UnityEngine.Experimental.GlobalIllumination;