Merge branch 'master' into 1.2

2021-04-13 09:52:03 +02:00
parent b2ae91e3b9 df07529f21
commit ac1eb8d58d
39 changed files with 531 additions and 132 deletions
--- a/Source/Engine/Graphics/RenderTask.h
+++ b/Source/Engine/Graphics/RenderTask.h
@@ -251,7 +251,7 @@ public:
    /// <summary>
    /// The scene rendering camera. Can be used to override the rendering view properties based on the current camera setup.
    /// </summary>
-    API_FIELD() Camera* Camera = nullptr;
+    API_FIELD() ScriptingObjectReference<Camera> Camera;

    /// <summary>
    /// The render view description.