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

[Peter Kim]

Commit: 585f98784c1fabd628ea6379dfa8820c27aa9019
Author: Peter Kim
Date:   Sat Apr 10 13:28:17 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB585f98784c1fabd628ea6379dfa8820c27aa9019

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc release/scripts/addons
index e4e19a37d5f,bcd08a9506d..010723e443c
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e4e19a37d5f2c09cd25780c1b9e44b937771e18f
 -Subproject commit bcd08a9506d33bdd7358201031b04d041ef22d94
++Subproject commit 010723e443c6f404eea43ab531163289e558ba8a
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 158b2ba1b13,2f4e4e57b9f..5d952d3dd15
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -367,9 -367,8 +367,9 @@@ typedef struct View3D 
  #define V3D_LOCAL_COLLECTIONS (1 << 0)
  #define V3D_FLAG_UNUSED_1 (1 << 1) /* cleared */
  #define V3D_HIDE_HELPLINES (1 << 2)
- #define V3D_INVALID_BACKBUF (1 << 3)
+ #define V3D_FLAG_UNUSED_2 (1 << 3) /* cleared */
  #define V3D_XR_SESSION_MIRROR (1 << 4)
 +#define V3D_XR_SESSION_SURFACE (1 << 5)
  
  #define V3D_FLAG_UNUSED_10 (1 << 10) /* cleared */
  #define V3D_SELECT_OUTLINE (1 << 11)