[HDRP] Fix tube light mode

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

@@ -105,6 +105,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed SRP batcher not compatible with Decal (case 1311586).
 - Fixed error message when having MSAA and Screen Space Shadows (case 1318698).
 - Fixed Nans happening when the history render target is bigger than the current viewport (case 1321139).
+- Fixed Tube and Disc lights mode selection (case 1317776)
 
 ### Changed
 - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard

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

@@ -208,8 +208,9 @@ static void DrawGeneralContent(SerializedHDLight serialized, Editor owner)
             }
             EditorGUI.showMixedValue = false;
 
-            //Draw the mode
-            serialized.settings.DrawLightmapping();
+            // Draw the mode, for Tube and Disc lights, there is only one choice, so we can disable the enum.
+            using (new EditorGUI.DisabledScope(serialized.areaLightShape == AreaLightShape.Tube || serialized.areaLightShape == AreaLightShape.Disc))
+                serialized.settings.DrawLightmapping();
 
             if (updatedLightType == HDLightType.Area)
             {

com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.Types.cs

@@ -322,6 +322,12 @@ void ResolveAreaShape()
                 legacyLight.type = LightType.Disc;
 #if UNITY_EDITOR
                 legacyLight.lightmapBakeType = LightmapBakeType.Baked;
+#endif
+            }
+            else if (areaLightShape == AreaLightShape.Tube)
+            {
+#if UNITY_EDITOR
+                legacyLight.lightmapBakeType = LightmapBakeType.Realtime;
 #endif
             }
             else