Skip to content

CMCL-891: Fix null output camera on first frame #439

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
May 3, 2022
Merged

CMCL-891: Fix null output camera on first frame #439

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e34cffa
Fix output camera being null on first frame
gaborkb May 3, 2022
a6862da
Need to update outputCamera when target changes
gaborkb May 3, 2022
3ae0f09
Unused usings removed
gaborkb May 3, 2022
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
19 changes: 15 additions & 4 deletions com.unity.cinemachine/Runtime/Behaviours/CinemachineBrain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.SceneManagement;
using UnityEngine.Serialization;

#if CINEMACHINE_HDRP || CINEMACHINE_LWRP_7_3_1
#if CINEMACHINE_HDRP_7_3_1
Expand Down Expand Up @@ -207,8 +206,16 @@ public Camera OutputCamera
public GameObject ControlledObject
{
get => m_TargetOverride == null ? gameObject : m_TargetOverride;
set => m_TargetOverride = value;
set
{
if (!ReferenceEquals(m_TargetOverride, value))
{
m_TargetOverride = value;
ControlledObject.TryGetComponent(out m_OutputCamera); // update output camera when target changes
}
}
}

private GameObject m_TargetOverride = null; // never use directly - use accessor

/// <summary>Event with a CinemachineBrain parameter</summary>
Expand Down Expand Up @@ -299,11 +306,15 @@ void OnSceneUnloaded(Scene scene)
ManualUpdate();
}

private void Start()
void Awake()
{
ControlledObject.TryGetComponent(out m_OutputCamera);
}

void Start()
{
m_LastFrameUpdated = -1;
UpdateVirtualCameras(CinemachineCore.UpdateFilter.Late, -1f);
ControlledObject.TryGetComponent(out m_OutputCamera);
}

private void OnGuiHandler()
Expand Down