Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master'

Author: keijiro

PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs

@@ -70,6 +70,10 @@ public override void OnInspectorGUI()
 
                 EditorGUILayout.LabelField("Motion Vectors (overlay)", EditorStyles.boldLabel);
                 EditorGUI.indentLevel++;
+
+                if (m_MotionVectors.motionImageOpacity.floatValue > 0f)
+                    EditorGUILayout.HelpBox("Please keep opacity to 0 if you're subject to motion sickness.", MessageType.Warning);
+
                 EditorGUILayout.PropertyField(m_MotionVectors.motionImageOpacity, EditorGUIHelper.GetContent("Opacity"));
                 EditorGUILayout.PropertyField(m_MotionVectors.motionImageAmplitude, EditorGUIHelper.GetContent("Amplitude"));
                 EditorGUI.indentLevel--;

PostProcessing/Resources/Shaders/BuiltinDebugViews.shader

@@ -236,13 +236,16 @@ Shader "Hidden/Post FX/Builtin Debug Views"
 
                 #pragma vertex VertDefault
                 #pragma fragment FragMovecsImaging
+                #pragma multi_compile __ UNITY_COLORSPACE_GAMMA
 
             ENDCG
         }
 
         // (4) - Motion vectors - Arrows
         Pass
         {
+            Blend SrcAlpha OneMinusSrcAlpha
+
             CGPROGRAM
 
                 #pragma vertex VertArrows

PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs

@@ -52,7 +52,7 @@ public static MotionVectorsSettings defaultSettings
                     {
                         sourceOpacity = 1f,
 
-                        motionImageOpacity = 0.9f,
+                        motionImageOpacity = 0f,
                         motionImageAmplitude = 16f,
 
                         motionVectorsOpacity = 1f,