[Bf-blender-cvs] [e089ad2b4bb] xr-actions-D9124: Merge branch 'master' into xr-actions-D9124

[Peter Kim]

Commit: e089ad2b4bbcb4aad4142fe72028dc2ee6715379
Author: Peter Kim
Date:   Sun Nov 22 19:40:36 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBe089ad2b4bbcb4aad4142fe72028dc2ee6715379

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc source/blender/editors/include/ED_view3d_offscreen.h
index 393976aa91f,e854982c796..de5dcc0b9ac
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@@ -68,10 -67,8 +67,9 @@@ void ED_view3d_draw_offscreen_simple(st
                                       const float winmat[4][4],
                                       float clip_start,
                                       float clip_end,
 +                                     bool is_xr_surface,
                                       bool is_image_render,
-                                      bool do_sky,
-                                      bool is_persp,
+                                      bool draw_background,
                                       const char *viewname,
                                       const bool do_color_management,
                                       struct GPUOffScreen *ofs,
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 42a37d461c7,3b5dc3f57b9..9af4095df10
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1782,10 -1782,8 +1805,9 @@@ void ED_view3d_draw_offscreen_simple(De
                                       const float winmat[4][4],
                                       float clip_start,
                                       float clip_end,
 +                                     bool is_xr_surface,
                                       bool is_image_render,
-                                      bool do_sky,
-                                      bool is_persp,
+                                      bool draw_background,
                                       const char *viewname,
                                       const bool do_color_management,
                                       GPUOffScreen *ofs,
diff --cc source/blender/makesdna/DNA_xr_types.h
index 0f1b9f69777,2ce32a723a7..49eeeabcd09
--- a/source/blender/makesdna/DNA_xr_types.h
+++ b/source/blender/makesdna/DNA_xr_types.h
@@@ -70,12 -58,6 +74,16 @@@ typedef enum eXRSessionBasePoseType 
    XR_BASE_POSE_CUSTOM = 2,
  } eXRSessionBasePoseType;
  
 +typedef enum eXrSessionEye {
 +  XR_EYE_LEFT = 0,
 +  XR_EYE_RIGHT = 1,
 +} eXrSessionEye;
 +
 +typedef enum eXrSessionObjectFlag {
 +  XR_OBJECT_ENABLE = (1 << 0),
 +  XR_OBJECT_AUTOKEY = (1 << 1),
 +} eXrSessionObjectFlag;
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --cc source/blender/windowmanager/xr/intern/wm_xr_draw.c
index 39f21466710,1b1ea6c1e61..ef13d0ca320
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
@@@ -151,10 -140,8 +151,9 @@@ void wm_xr_draw_view(const GHOST_XrDraw
                                    winmat,
                                    settings->clip_start,
                                    settings->clip_end,
 +                                  true,
                                    false,
                                    true,
-                                   true,
                                    NULL,
                                    false,
                                    surface_data->offscreen,