[Bf-blender-cvs] [1c49f0cc206] vr_scene_inspection: Merge branch 'soc-2019-openxr' into vr_scene_inspection

Julian Eisel noreply at git.blender.org
Thu Mar 5 12:47:26 CET 2020


Commit: 1c49f0cc206bcf51743edf37eb68b9d0fc826330
Author: Julian Eisel
Date:   Thu Mar 5 12:41:41 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB1c49f0cc206bcf51743edf37eb68b9d0fc826330

Merge branch 'soc-2019-openxr' into vr_scene_inspection

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



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

diff --cc source/blender/windowmanager/intern/wm_operators.c
index d97b054af80,10366d1f974..bce0d9de2e1
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -3606,31 -3645,7 +3645,31 @@@ static void WM_OT_stereo3d_set(wmOperat
  
  /** \} */
  
- #ifdef WITH_OPENXR
+ #ifdef WITH_XR_OPENXR
 +
 +static void wm_xr_session_disable_mirror_views(Main *bmain)
 +{
 +  for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +    for (ScrArea *area = screen->areabase.first; area; area = area->next) {
 +      for (SpaceLink *slink = area->spacedata.first; slink; slink = slink->next) {
 +        if (slink->spacetype == SPACE_VIEW3D) {
 +          View3D *v3d = (View3D *)slink;
 +          if (v3d->flag & V3D_XR_SESSION_MIRROR) {
 +            ListBase *region_list = (slink == area->spacedata.first) ? &area->regionbase :
 +                                                                       &slink->regionbase;
 +            /* The free main region (e.g. the unlocked one in quad-view) is always the last one,
 +             * see rna_SpaceView3D_region_3d_get(). */
 +            ARegion *region = region_list->last;
 +            RegionView3D *rv3d = region->regiondata;
 +
 +            rv3d->viewlock &= ~(RV3D_LOCK_ANY_TRANSFORM | RV3D_LOCK_RUNTIME_ONLY);
 +          }
 +        }
 +      }
 +    }
 +  }
 +}
 +
  static int wm_xr_session_toggle_exec(bContext *C, wmOperator *UNUSED(op))
  {
    wmWindowManager *wm = CTX_wm_manager(C);
@@@ -3667,8 -3676,7 +3706,8 @@@ static void WM_OT_xr_session_toggle(wmO
     * UI instead. Not meant as a permanent solution. */
    ot->flag = OPTYPE_INTERNAL;
  }
 +
- #endif /* WITH_OPENXR */
+ #endif /* WITH_XR_OPENXR */
  
  /* -------------------------------------------------------------------- */
  /** \name Operator Registration & Keymaps
diff --cc source/blender/windowmanager/wm.h
index 3a804125994,9c7666647f3..e6116bc1421
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -102,10 -102,10 +102,10 @@@ void wm_open_init_use_scripts(wmOperato
  /* wm_draw.c */
  void wm_draw_offscreen_texture_parameters(struct GPUOffScreen *offscreen);
  
- #ifdef WITH_OPENXR
+ #ifdef WITH_XR_OPENXR
  /* wm_xr.c */
  bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm);
 -void wm_xr_context_destroy(wmWindowManager *wm);
 +void wm_xr_data_destroy(wmWindowManager *wm);
  void wm_xr_session_toggle(bContext *C, void *xr_context);
  #endif



More information about the Bf-blender-cvs mailing list