Fixed an error when switch area light shape to disk while an emissive mesh is displayed. (#1112)

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

Author: fredericv-unity3d

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

@@ -711,6 +711,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed glitch in Project settings window when selecting diffusion profiles in material section (case 1253090)
 - Fixed issue with light layers bigger than 8 (and above the supported range). 
 - Fixed issue with culling layer mask of area light's emissive mesh 
+- Fixed errors when switching area light to disk shape while an area emissive mesh was displayed.
 
 ### Changed
 - Improve MIP selection for decals on Transparents

com.unity.render-pipelines.high-definition/Editor/Lighting/SerializedHDLight.cs

@@ -472,8 +472,10 @@ public void Update()
             settings.Update();
 
             lightGameObject.Update();
-            deportedAreaLightEmissiveMeshMotionVector?.serializedObject.Update();
-            deportedAreaLightEmissiveMeshLayer?.serializedObject.Update();
+            if (deportedAreaLightEmissiveMeshMotionVector.IsTargetAlive())
+                deportedAreaLightEmissiveMeshMotionVector?.serializedObject.Update();
+            if (deportedAreaLightEmissiveMeshLayer.IsTargetAlive())
+                deportedAreaLightEmissiveMeshLayer?.serializedObject.Update();
         }
 
         void ApplyInternal(bool withDeportedEmissiveMeshData)
@@ -482,8 +484,10 @@ void ApplyInternal(bool withDeportedEmissiveMeshData)
             settings.ApplyModifiedProperties();
             if (withDeportedEmissiveMeshData)
             {
-                deportedAreaLightEmissiveMeshMotionVector?.serializedObject.ApplyModifiedProperties();
-                deportedAreaLightEmissiveMeshLayer?.serializedObject.ApplyModifiedProperties();
+                if (deportedAreaLightEmissiveMeshMotionVector.IsTargetAlive())
+                    deportedAreaLightEmissiveMeshMotionVector?.serializedObject.ApplyModifiedProperties();
+                if (deportedAreaLightEmissiveMeshLayer.IsTargetAlive())
+                    deportedAreaLightEmissiveMeshLayer?.serializedObject.ApplyModifiedProperties();
             }
         }
 

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

@@ -287,6 +287,10 @@ public static IEnumerable<string> EnumerateDisplayName(this SerializedProperty p
                 yield return property.displayName;
         }
 
+        public static bool IsTargetAlive(this SerializedProperty property)
+            => property != null && property.serializedObject.targetObject != null &&
+               !property.serializedObject.targetObject.Equals(null);
+
         /// <summary>
         /// Helper to get an enum value from a SerializedProperty.
         /// This handle case where index do not correspond to enum value.