[Bf-extensions-cvs] [adab23c5] xr-dev: Merge branch 'master' into xr-dev

[Peter Kim]

Commit: adab23c5510c58c7443675e6fb8508376d6ebb31
Author: Peter Kim
Date:   Tue May 3 10:39:29 2022 +0900
Branches: xr-dev
https://developer.blender.org/rBAadab23c5510c58c7443675e6fb8508376d6ebb31

Merge branch 'master' into xr-dev

===================================================================



===================================================================

diff --cc viewport_vr_preview/gui.py
index 931ddd09,b783bd25..503e3fc4
--- a/viewport_vr_preview/gui.py
+++ b/viewport_vr_preview/gui.py
@@@ -672,15 -248,9 +692,16 @@@ class VIEW3D_PT_vr_info(bpy.types.Panel
  classes = (
      VIEW3D_PT_vr_session,
      VIEW3D_PT_vr_session_view,
+     VIEW3D_PT_vr_session_view_object_type_visibility,
      VIEW3D_PT_vr_landmarks,
 -    VIEW3D_PT_vr_actionmaps,
 +    VIEW3D_PT_vr_actions_actionmaps,
 +    VIEW3D_PT_vr_actions_actions,
 +    VIEW3D_PT_vr_actions_user_paths,
 +    VIEW3D_PT_vr_actions_haptics,
 +    VIEW3D_PT_vr_actions_bindings,
 +    VIEW3D_PT_vr_actions_component_paths,
 +    VIEW3D_PT_vr_actions_extensions,
 +    VIEW3D_PT_vr_motion_capture,
      VIEW3D_PT_vr_viewport_feedback,
  
      VIEW3D_UL_vr_landmarks,