Fixed an exception occuring when a camera doesn't have an HDAdditionalCameraData (1254383). (#846)

Co-authored-by: sebastienlagarde <[email protected]>

Author: anisunity

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -680,6 +680,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed AxF handling of roughness for Blinn-Phong type materials
 - Fixed AxF UI errors when surface type is switched to transparent
 - Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change.
+- Fixed an exception occuring when a camera doesn't have an HDAdditionalCameraData (1254383).
 
 ### Changed
 - Improve MIP selection for decals on Transparents

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEngine.Assertions;
+using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
 using System.Collections.Generic;
 using System.Linq;
@@ -89,14 +90,24 @@ public void RemoveComponent(Camera camera, IEnumerable<Component> dependencies)
         [MenuItem("CONTEXT/Camera/Reset", false, 0)]
         static void ResetCamera(MenuCommand menuCommand)
         {
-            GameObject go = ((Camera)menuCommand.context).gameObject;
+            // Grab the current HDRP asset, we should not be executing this code if HDRP is null
+            var hdrp = (RenderPipelineManager.currentPipeline as HDRenderPipeline);
+            if (hdrp == null)
+                return;
 
+            GameObject go = ((Camera)menuCommand.context).gameObject;
             Assert.IsNotNull(go);
 
             Camera camera = go.GetComponent<Camera>();
-            HDAdditionalCameraData cameraAdditionalData = go.GetComponent<HDAdditionalCameraData>();
-
             Assert.IsNotNull(camera);
+
+            // Try to grab the HDAdditionalCameraData component, it is possible that the component is null of the camera was created without an asset assigned and the inspector
+            // was kept on while assigning the asset and then triggering the reset.
+            HDAdditionalCameraData cameraAdditionalData;
+            if ((!go.TryGetComponent<HDAdditionalCameraData>(out cameraAdditionalData)))
+            {
+                cameraAdditionalData = go.AddComponent<HDAdditionalCameraData>();
+            }
             Assert.IsNotNull(cameraAdditionalData);
 
             Undo.SetCurrentGroupName("Reset HD Camera");