Skip to content

Fix error when using gizmos with camera stack in editor #5913

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 5 commits into from
Oct 12, 2021
Merged

Fix error when using gizmos with camera stack in editor #5913

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36372be
Fix game window gizmos when camera stack is used
tomzig16 Sep 9, 2021
1d0c961
Merge branch 'master' into urp/editor/fix-gizmos-with-camera-stack
tomzig16 Oct 5, 2021
055c1a0
Remove Assert check for the last camera in stack
tomzig16 Oct 5, 2021
6e8d51c
Add lastCameraInStack check
tomzig16 Oct 5, 2021
e68a78e
Merge branch 'master' into urp/editor/fix-gizmos-with-camera-stack
tomzig16 Oct 6, 2021
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: 1 addition & 2 deletions com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,10 +854,9 @@ public override void Setup(ScriptableRenderContext context, ref RenderingData re
}

#if UNITY_EDITOR
if (isSceneViewCamera || isGizmosEnabled)
if (isSceneViewCamera || (isGizmosEnabled && lastCameraInTheStack))
{
// Scene view camera should always resolve target (not stacked)
Assertions.Assert.IsTrue(lastCameraInTheStack, "Editor camera must resolve target upon finish rendering.");
m_FinalDepthCopyPass.Setup(m_DepthTexture, RenderTargetHandle.CameraTarget);
m_FinalDepthCopyPass.MssaSamples = 0;
EnqueuePass(m_FinalDepthCopyPass);
Expand Down