[Bf-blender-cvs] [ff347bf9502] xr-dev: Merge branch 'master' into xr-dev

[Peter Kim]

Commit: ff347bf95023839e3eec0a073099ea4d91e3fa1f
Author: Peter Kim
Date:   Tue Mar 15 20:06:14 2022 +0900
Branches: xr-dev
https://developer.blender.org/rBff347bf95023839e3eec0a073099ea4d91e3fa1f

Merge branch 'master' into xr-dev

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



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

diff --cc source/blender/editors/interface/CMakeLists.txt
index 3e10d808058,100be2c10c9..14d8e136061
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@@ -102,8 -104,8 +104,11 @@@ if(WIN32 OR APPLE
    endif()
  endif()
  
 +if(WITH_XR_OPENXR)
 +  add_definitions(-DWITH_XR_OPENXR)
 +endif()
  
  blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+ 
+ # RNA_prototypes.h
+ add_dependencies(bf_editor_interface bf_rna)