GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix using Camera refs

Browse Source
This commit is contained in:
Wojtek Figat
2021-04-12 12:57:15 +02:00
parent 8a725ec243
commit 5ab554f61c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Level/Actors/Camera.cpp
View File

@@ -17,12 +17,13 @@
Array<Camera*> Camera::Cameras;
Camera* Camera::CutSceneCamera = nullptr;
Camera* Camera::OverrideMainCamera = nullptr;
ScriptingObjectReference<Camera> Camera::OverrideMainCamera;
Camera* Camera::GetMainCamera()
{
if (OverrideMainCamera)
return OverrideMainCamera;
Camera* overrideMainCamera = OverrideMainCamera.Get();
if (overrideMainCamera)
return overrideMainCamera;
if (CutSceneCamera)
return CutSceneCamera;
return Cameras.HasItems() ? Cameras.First() : nullptr;

2
Source/Engine/Level/Actors/Camera.h
View File

@@ -28,7 +28,7 @@ DECLARE_SCENE_OBJECT(Camera);
static Camera* CutSceneCamera;
// The overriden main camera.
API_FIELD() static Camera* OverrideMainCamera;
API_FIELD() static ScriptingObjectReference<Camera> OverrideMainCamera;
// Gets the main camera.
API_PROPERTY() static Camera* GetMainCamera();