2018.3 scene view fix

Author: Chman

PostProcessing/Runtime/PostProcessLayer.cs

@@ -580,7 +580,7 @@ void UpdateSettingsIfNeeded(PostProcessRenderContext context)
             if (m_SettingsUpdateNeeded)
             {
                 context.command.BeginSample("VolumeBlending");
-                PostProcessManager.instance.UpdateSettings(this);
+                PostProcessManager.instance.UpdateSettings(this, context.camera);
                 context.command.EndSample("VolumeBlending");
                 m_TargetPool.Reset();
 

PostProcessing/Runtime/PostProcessManager.cs

@@ -278,7 +278,7 @@ void ReplaceData(PostProcessLayer postProcessLayer)
             }
         }
 
-        internal void UpdateSettings(PostProcessLayer postProcessLayer)
+        internal void UpdateSettings(PostProcessLayer postProcessLayer, Camera camera)
         {
             // Reset to base state
             ReplaceData(postProcessLayer);
@@ -295,6 +295,12 @@ internal void UpdateSettings(PostProcessLayer postProcessLayer)
             // Traverse all volumes
             foreach (var volume in volumes)
             {
+#if UNITY_EDITOR
+                // Skip volumes that aren't in the scene currently displayed in the scene view
+                if (!IsVolumeRenderedByCamera(volume, camera))
+                    continue;
+#endif
+
                 // Skip disabled volumes and volumes without any data or weight
                 if (!volume.enabled || volume.profileRef == null || volume.weight <= 0f)
                     continue;
@@ -407,5 +413,19 @@ static void SortByPriority(List<PostProcessVolume> volumes)
                 volumes[j + 1] = temp;
             }
         }
+
+        static bool IsVolumeRenderedByCamera(PostProcessVolume volume, Camera camera)
+        {
+#if UNITY_2018_3_OR_NEWER && UNITY_EDITOR
+            // If the current camera have a custom scene then the camera is rendering that scene,
+            // otherwise the camera is rendering the scenes in the SceneManager.
+            var customScene = camera.scene;
+            return customScene.IsValid()
+                ? UnityEditor.SceneManagement.EditorSceneManager.IsGameObjectInScene(volume.gameObject, customScene)
+                : UnityEditor.SceneManagement.EditorSceneManager.IsGameObjectInMainScenes(volume.gameObject);
+#else
+            return true;
+#endif
+        }
     }
 }