Merge pull request #6742 from davidkline-ms/pv6732

Mark MRC capture settings as experimental, disabled by default

Author: David Kline

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Editor/WindowsMixedRealityCameraSettingsProfileInspector.cs

@@ -37,14 +37,16 @@ public override void OnInspectorGUI()
                 serializedObject.Update();
 
                 EditorGUILayout.Space();
-                EditorGUILayout.LabelField("Mixed Reality Capture Settings", EditorStyles.boldLabel);
-
                 using (new EditorGUILayout.HorizontalScope())
                 {
-                    EditorGUILayout.PropertyField(renderFromPVCameraForMixedRealityCapture, pvCameraRenderingTitle);
+                    EditorGUILayout.LabelField("Mixed Reality Capture Settings (Experimental)", EditorStyles.boldLabel);
                     InspectorUIUtility.RenderDocumentationButton(MRCDocURL);
                 }
 
+                EditorGUILayout.HelpBox("Render from PV Camera is supported on Unity 2018.4.12f1 or newer and 2019.3 or newer. Enabling the feature on other versions may result in incorrect capture behavior.", MessageType.Info);
+
+                EditorGUILayout.PropertyField(renderFromPVCameraForMixedRealityCapture, pvCameraRenderingTitle);
+
                 serializedObject.ApplyModifiedProperties();
             }
         }

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Profiles/DefaultWindowsMixedRealityCameraSettingsProfile.asset

@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: DefaultWindowsMixedRealityCameraSettingsProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
-  renderFromPVCameraForMixedRealityCapture: 1
+  renderFromPVCameraForMixedRealityCapture: 0

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityCameraSettingsProfile.cs

@@ -9,13 +9,13 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
     /// <summary>
     /// Configuration profile for the Windows Mixed Reality Camera settings provider.
     /// </summary>
-    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Windows Mixed Reality Camera Settings Profile", fileName = "DefaultWindowsMixedRealityCameraSettingsProfile", order = 100)]
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Windows Mixed Reality Camera Settings Profile", fileName = "WindowsMixedRealityCameraSettingsProfile", order = 100)]
     [MixedRealityServiceProfile(typeof(WindowsMixedRealityCameraSettings))]
     public class WindowsMixedRealityCameraSettingsProfile : BaseCameraSettingsProfile
     {
         [SerializeField]
         [Tooltip("If enabled, will render scene from PV camera projection matrix while MRC is active. This will ensure that holograms, such as hand meshes, remain visibly aligned in the video output.")]
-        private bool renderFromPVCameraForMixedRealityCapture = true;
+        private bool renderFromPVCameraForMixedRealityCapture = false;
 
         /// <summary>
         /// Whether to use photo/video camera rendering for Mixed Reality Capture on Windows.