[Bf-blender-cvs] [463fe7c949c] vr_scene_inspection: Merge branch 'soc-2019-openxr' into vr_scene_inspection

[Julian Eisel]

Commit: 463fe7c949c3a74c107d7fdf2c3ddff7bca17be4
Author: Julian Eisel
Date:   Mon Mar 2 15:49:36 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB463fe7c949c3a74c107d7fdf2c3ddff7bca17be4

Merge branch 'soc-2019-openxr' into vr_scene_inspection

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 0b29773bbf5,a4e621f7099..96faa029975
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4525,10 -4525,7 +4525,9 @@@ void blo_do_versions_280(FileData *fd, 
                                                V3D_OFSDRAW_SHOW_ANNOTATION);
          wm->xr.session_settings.clip_start = v3d_default->clip_start;
          wm->xr.session_settings.clip_end = v3d_default->clip_end;
 +
 +        wm->xr.session_settings.flag = XR_SESSION_USE_POSITION_TRACKING;
        }
      }
- #endif
    }
  }
diff --cc source/blender/makesrna/intern/rna_wm.c
index 8872afb2792,ca9c91c1ca7..470344799a1
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@@ -2478,14 -2477,6 +2477,13 @@@ static void rna_def_windowmanager(Blend
    RNA_def_property_flag(prop, PROP_NEVER_NULL);
    RNA_def_property_ui_text(prop, "XR Session Settings", "");
  
 +  prop = RNA_def_property(srna, "xr_session_state", PROP_POINTER, PROP_NONE);
 +  RNA_def_property_struct_type(prop, "XrSessionState");
 +  RNA_def_property_pointer_sdna(prop, NULL, "xr.session_state");
 +  RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 +  RNA_def_property_ui_text(
 +      prop, "XR Session State", "Runtime state information about the VR session");
- #  endif
 +
    RNA_api_wm(srna);
  }
  
diff --cc source/blender/makesrna/intern/rna_xr.c
index f4aa31859c3,f2f73984801..11e95b02855
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@@ -24,49 -23,10 +24,45 @@@
  #include "RNA_define.h"
  #include "RNA_enum_types.h"
  
 +#include "WM_types.h"
 +
  #include "rna_internal.h"
  
- #ifndef WITH_OPENXR
- BLI_STATIC_ASSERT(false, "Tried to compile rna_xr.c even though WITH_OPENXR is not defined.");
- #endif
- 
  #ifdef RNA_RUNTIME
  
 +#  include "WM_api.h"
 +
 +static bool rna_XrSessionState_is_running(bContext *C)
 +{
 +  const wmWindowManager *wm = CTX_wm_manager(C);
 +  return WM_xr_is_session_running(&wm->xr);
 +}
 +
 +static wmXrData *rna_XrSessionState_wm_xr_data_get(PointerRNA *ptr)
 +{
 +  /* Callers could also get bXrSessionState pointer through ptr->data, but prefer if we just
 +   * consistently pass wmXrData pointers to the WM_xr_xxx() API. */
 +
 +  BLI_assert(ptr->type == &RNA_XrSessionState);
 +
 +  wmWindowManager *wm = (wmWindowManager *)ptr->owner_id;
 +  BLI_assert(wm && (GS(wm->id.name) == ID_WM));
 +
 +  return &wm->xr;
 +}
 +
 +static void rna_XrSessionState_viewer_location_get(PointerRNA *ptr, float *values)
 +{
 +  const wmXrData *xr = rna_XrSessionState_wm_xr_data_get(ptr);
 +  WM_xr_session_state_viewer_location_get(xr, values);
 +}
 +
 +static void rna_XrSessionState_viewer_rotation_get(PointerRNA *ptr, float *values)
 +{
 +  const wmXrData *xr = rna_XrSessionState_wm_xr_data_get(ptr);
 +  WM_xr_session_state_viewer_rotation_get(xr, values);
 +}
 +
  #else /* RNA_RUNTIME */
  
  static void rna_def_xr_session_settings(BlenderRNA *brna)