Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings

TestProjects/LWGraphicsTest/Packages/manifest.json

 {
   "dependencies": {
+    "com.unity.analytics": "2.0.16",
+    "com.unity.package-manager-ui": "2.0.0-preview.3",
-    "com.unity.textmeshpro": "1.2.4"
+    "com.unity.standardevents": "1.0.13",
+    "com.unity.textmeshpro": "1.2.1",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
   },
   "testables": [
     "com.unity.render-pipelines.lightweight",

com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/SerializedHDReflectionProbe.cs

                 && editorSimplifiedModeBlendDistance.floatValue == 0f
                 && editorAdvancedModeBlendNormalDistancePositive.vector3Value == Vector3.zero
                 && editorAdvancedModeBlendNormalDistanceNegative.vector3Value == Vector3.zero
-                && editorSimplifiedModeBlendNormalDistance.floatValue == 0f)
+                && editorSimplifiedModeBlendNormalDistance.floatValue == 0f
+                && (blendDistancePositive.vector3Value != Vector3.zero
+                    || blendDistanceNegative.vector3Value != Vector3.zero
+                    || blendNormalDistancePositive.vector3Value != Vector3.zero
+                    || blendNormalDistanceNegative.vector3Value != Vector3.zero))
             {
                 Vector3 positive = blendDistancePositive.vector3Value;
                 Vector3 negative = blendDistanceNegative.vector3Value;
 
                 //display old data
                 editorAdvancedModeEnabled.boolValue = true;
+                Apply();
             }
 
             proxyVolumeComponent = addso.Find((HDAdditionalReflectionData d) => d.proxyVolumeComponent);

com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/Volume/SerializedInfluenceVolume.cs

                 && editorSimplifiedModeBlendDistance.floatValue == 0f
                 && editorAdvancedModeBlendNormalDistancePositive.vector3Value == Vector3.zero
                 && editorAdvancedModeBlendNormalDistanceNegative.vector3Value == Vector3.zero
-                && editorSimplifiedModeBlendNormalDistance.floatValue == 0f)
+                && editorSimplifiedModeBlendNormalDistance.floatValue == 0f
+                && (boxInfluencePositiveFade.vector3Value != Vector3.zero
+                    || boxInfluenceNegativeFade.vector3Value != Vector3.zero))
             {
                 Vector3 positive = boxInfluencePositiveFade.vector3Value;
                 Vector3 negative = boxInfluenceNegativeFade.vector3Value;
                 //aproximated simplified
                 editorSimplifiedModeBlendDistance.floatValue = Mathf.Max(positive.x, positive.y, positive.z, negative.x, negative.y, negative.z);
 
-                positive = boxInfluenceNormalPositiveFade.vector3Value;
-                negative = boxInfluenceNormalNegativeFade.vector3Value;
-                //exact advanced
-                editorAdvancedModeBlendNormalDistancePositive.vector3Value = positive;
-                editorAdvancedModeBlendNormalDistanceNegative.vector3Value = negative;
-                //aproximated simplified
-                editorSimplifiedModeBlendNormalDistance.floatValue = Mathf.Max(positive.x, positive.y, positive.z, negative.x, negative.y, negative.z);
+                //no normal modification allowed anymore in PlanarReflectionProbe
+                boxInfluenceNormalPositiveFade.vector3Value = Vector3.zero;
+                boxInfluenceNormalNegativeFade.vector3Value = Vector3.zero;
+                Apply();
             }
         }