Internal/master

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs

@@ -35,20 +35,31 @@ public class CoreBuildData : IDisposable
         public List<RenderPipelineAsset> renderPipelineAssets { get; private set; } = new();
 
         /// <summary>
-        /// Whether the build is a development build or not.
+        /// Whether the current build's managed code variant has <c>UNITY_ENABLE_CHECKS</c> defined
+        /// (Debug or Checked variant).
         /// </summary>
-        public bool developmentBuild { get; private set; } = false;
+        /// <remarks>
+        /// Use this to gate inclusion of diagnostic shaders, resources, and other build-time decisions
+        /// that mirror C# code paths compiled under <c>#if UNITY_ENABLE_CHECKS</c>.
+        /// </remarks>
+        public bool useDiagnosticChecks { get; private set; } = false;
+
+        /// <summary>
+        /// Obsolete. Always returns <c>false</c>.
+        /// </summary>
+        [Obsolete("developmentBuild is no longer populated and always returns false. Use useDiagnosticChecks for stripping decisions that mirror UNITY_ENABLE_CHECKS-gated C# code.")]
+        public bool developmentBuild => false;
 
         internal Dictionary<EntityId, ComputeShader> computeShaderCache { get; private set; } = new();
 
         internal bool pipelineSupportGPUResidentDrawer { get; private set; } = false;
         internal bool playerNeedGPUResidentDrawer { get; private set; } = false;
 
-        private CoreBuildData(BuildTarget buildTarget, bool development)
+        private CoreBuildData(BuildTarget buildTarget)
         {
             m_Instance = this;
 
-            developmentBuild = development;
+            useDiagnosticChecks = PlayerSettings.GetManagedCodeVariant(GetNamedBuildTarget(buildTarget)) <= ManagedCodeVariant.Checked;
 
             if (!buildTarget.TryGetRenderPipelineAssets(renderPipelineAssets))
                 return;
@@ -63,7 +74,19 @@ private CoreBuildData(BuildTarget buildTarget, bool development)
         }
 
         private static CoreBuildData CreateInstance()
-            => new(EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.development);
+            => new(EditorUserBuildSettings.activeBuildTarget);
+
+        // NamedBuildTarget for buildTarget under the active subtarget (Player vs Server for Standalone).
+        private static NamedBuildTarget GetNamedBuildTarget(BuildTarget buildTarget)
+        {
+            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
+            if (buildTargetGroup == BuildTargetGroup.Standalone &&
+                EditorUserBuildSettings.standaloneBuildSubtarget == StandaloneBuildSubtarget.Server)
+            {
+                return NamedBuildTarget.Server;
+            }
+            return NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
+        }
 
         private void CheckGPUResidentDrawerUsage()
         {

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/SettingsStrippers/RenderingDebuggerRuntimeResourcesStripper.cs

@@ -6,6 +6,6 @@ class RenderingDebuggerRuntimeResourcesStripper : IRenderPipelineGraphicsSetting
     {
         public bool active => true;
 
-        public bool CanRemoveSettings(RenderingDebuggerRuntimeResources settings) => !CoreBuildData.instance.developmentBuild;
+        public bool CanRemoveSettings(RenderingDebuggerRuntimeResources settings) => !CoreBuildData.instance.useDiagnosticChecks;
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.Deprecated.cs

@@ -1,4 +1,4 @@
-#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#if ENABLE_UIELEMENTS_MODULE && UNITY_ENABLE_CHECKS
 #define ENABLE_RENDERING_DEBUGGER_UI
 #endif
 

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs

@@ -1,4 +1,4 @@
-#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#if ENABLE_UIELEMENTS_MODULE && UNITY_ENABLE_CHECKS
 #define ENABLE_RENDERING_DEBUGGER_UI
 #endif
 

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -1,4 +1,4 @@
-#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#if ENABLE_UIELEMENTS_MODULE && UNITY_ENABLE_CHECKS
 #define ENABLE_RENDERING_DEBUGGER_UI
 #endif
 

Packages/com.unity.render-pipelines.core/Editor/InternalBridge/AssemblyInfo.cs

@@ -2,3 +2,4 @@
 
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]

Packages/com.unity.render-pipelines.core/Editor/InternalBridge/ObjectSelector.cs

@@ -10,5 +10,12 @@ public static void Show(UnityEngine.Object obj, Type requiredType, UnityEngine.O
         {
             UnityEditor.ObjectSelector.get.Show(obj, requiredType, objectBeingEdited, allowSceneObjects, allowedEntityIds, onObjectSelectorClosed, onObjectSelectedUpdated, showNoneItem);
         }
+
+        public static void SetVisualSelection(EntityId entityId)
+        {
+            UnityEditor.ObjectSelector.get.SetVisualSelection(entityId);
+        }
+
+        public static bool isVisible => UnityEditor.ObjectSelector.isVisible;
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs

@@ -1717,8 +1717,11 @@ Vector3Int GetCellPositionFromVoxel(Vector3Int voxelToLookup, int cellSizeInBric
                         continue;
 
                     // 3.
-                    // Overwrite lighting data with trilinear sampled data from the brick with highest subdiv level
-                    float brickSize = ProbeReferenceVolume.instance.BrickSize(largestBrick.subdivisionLevel - 1);
+                    // Overwrite lighting data with trilinear sampled data from the brick with highest subdiv level.
+                    // Use minBrickSize from m_ProfileInfo (live bake settings), not ProbeReferenceVolume.instance,
+                    // because that runtime state is restored to the previous bake's snapshot at the end of
+                    // ApplySubdivisionResults and would be stale here. UUM-141983.
+                    float brickSize = ProbeVolumeUtil.BrickSize(minBrickSize, largestBrick.subdivisionLevel - 1);
                     float3 uvw = math.clamp((pos - (Vector3)largestBrick.position * minBrickSize) / brickSize, 0, 3);
 
                     var probe = Vector3Int.FloorToInt(uvw);

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs

@@ -1,4 +1,4 @@
-#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#if ENABLE_UIELEMENTS_MODULE && UNITY_ENABLE_CHECKS
 #define ENABLE_RENDERING_DEBUGGER_UI
 #endif
 

Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputSerialization.cs

@@ -5,7 +5,6 @@
 using Unity.Mathematics;
 using UnityEngine;
 using Unity.Collections.LowLevel.Unsafe;
-using UnityEditor.LightBaking;
 using MixedLightingMode = UnityEngine.MixedLightingMode;
 
 // The types defined in this file should match the types defined in BakeInput.h.
@@ -253,15 +252,16 @@ internal struct LightingSettings : IBakeInputVisitable
         public bool aoEnabled;
         public float aoDistance;
         public bool useHardwareRayTracing;
+        public bool enableHeightfieldRayTracing;
 
-        public LightSamplingMode directLightSamplingMode;
+        public UnityEngine.PathTracing.Core.LightSamplingMode directLightSamplingMode;
         public uint directRISCandidateCount;
-        public LightSamplingMode indirectLightSamplingMode;
+        public UnityEngine.PathTracing.Core.LightSamplingMode indirectLightSamplingMode;
         public UInt32 indirectRISCandidateCount;
         public LightAccelerationStructure lightAccelerationStructure;
         public uint lightGridMaxCells;
-        public EmissiveSamplingMode directEmissiveSamplingMode;
-        public EmissiveSamplingMode indirectEmissiveSamplingMode;
+        public UnityEngine.PathTracing.Core.EmissiveSamplingMode directEmissiveSamplingMode;
+        public UnityEngine.PathTracing.Core.EmissiveSamplingMode indirectEmissiveSamplingMode;
 
         public void Transfer(IBakeInputVisitor visitor)
         {
@@ -274,6 +274,7 @@ public void Transfer(IBakeInputVisitor visitor)
             visitor.TransferBoolean(ref aoEnabled);
             visitor.TransferBlittable(ref aoDistance);
             visitor.TransferBoolean(ref useHardwareRayTracing);
+            visitor.TransferBoolean(ref enableHeightfieldRayTracing);
 
             visitor.TransferBlittable(ref directLightSamplingMode);
             visitor.TransferBlittable(ref directRISCandidateCount);
@@ -572,6 +573,7 @@ internal struct LightData : IBakeInputVisitable
         public AngularFalloffType angularFalloff;
         public bool castsShadows;
         public UInt32 shadowMaskChannel;
+        public float indirectMultiplier;
 
         public void Transfer(IBakeInputVisitor visitor)
         {
@@ -592,6 +594,7 @@ public void Transfer(IBakeInputVisitor visitor)
             visitor.TransferBlittable(ref angularFalloff);
             visitor.TransferBoolean(ref castsShadows);
             visitor.TransferBlittable(ref shadowMaskChannel);
+            visitor.TransferBlittable(ref indirectMultiplier);
         }
     }
 
@@ -951,7 +954,7 @@ internal static class BakeInputSerialization
     {
         // Should match BakeInputSerialization::kCurrentFileVersion in BakeInputSerialization.h.
         // If these are out of sync, the implementation in this file probably needs to be updated.
-        const UInt64 CurrentFileVersion = 202603061;
+        const UInt64 CurrentFileVersion = 202605011;
 
         public static bool Deserialize(string path, out BakeInput bakeInput)
         {