Skip to content

Fixed double camera overlay #5639

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
Sep 14, 2021
Merged

Fixed double camera overlay #5639

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
456b744
Fixed double camera overlay
adrien-de-tocqueville Sep 13, 2021
a7fbe22
Fix for changing SRP
adrien-de-tocqueville Sep 14, 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
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 @@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed path traced subsurface scattering for transmissive surfaces (case 1329403)
- Fixed missing context menu for “Post Anti-Aliasing” in Camera (1357283)
- Fixed error when disabling opaque objects on a camera with MSAA.
- Fixed double camera preview.

### Changed
- Visual Environment ambient mode is now Dynamic by default.
Expand Down
11 changes: 11 additions & 0 deletions com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System;
using System.Reflection;
using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Rendering.HighDefinition;
Expand All @@ -14,6 +16,9 @@ partial class HDCameraEditor : Editor
Camera[] m_PreviewCameras;
HDAdditionalCameraData[] m_PreviewAdditionalCameraDatas;

static readonly Type k_SceneViewCameraOverlay = Type.GetType("UnityEditor.SceneViewCameraOverlay,UnityEditor");
static readonly FieldInfo k_SceneViewCameraOverlay_ForceDisable = k_SceneViewCameraOverlay.GetField("forceDisable", BindingFlags.Static | BindingFlags.NonPublic);

void OnEnable()
{
m_SerializedCamera = new SerializedHDCamera(serializedObject);
Expand All @@ -30,6 +35,9 @@ void OnEnable()
// Say that we are a camera editor preview and not just a regular preview
m_PreviewAdditionalCameraDatas[i].isEditorCameraPreview = true;
}

// Disable builtin camera overlay
k_SceneViewCameraOverlay_ForceDisable.SetValue(null, true);
}

void OnDisable()
Expand All @@ -43,6 +51,9 @@ void OnDisable()
DestroyImmediate(m_PreviewCameras[i].gameObject);
m_PreviewCameras = null;
m_PreviewAdditionalCameraDatas = null;

// Restore builtin camera overlay
k_SceneViewCameraOverlay_ForceDisable.SetValue(null, false);
}

public override void OnInspectorGUI()
Expand Down