[Bf-blender-cvs] [3ff91e97d99] soc-2019-openxr: Merge branch 'master' into temp-openxr-buildstuff

[Julian Eisel]

Commit: 3ff91e97d998f94043bbe5350334f92498dfb8c2
Author: Julian Eisel
Date:   Mon Jan 6 14:41:07 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB3ff91e97d998f94043bbe5350334f92498dfb8c2

Merge branch 'master' into temp-openxr-buildstuff

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



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

diff --cc CMakeLists.txt
index c43377833e9,6f8b512b69b..7d63db5ff24
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -247,8 -174,7 +174,14 @@@ option(WITH_FFTW3         "Enable FFTW
  option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
  option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
  mark_as_advanced(WITH_SYSTEM_BULLET)
- option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
- option(WITH_OPENXR        "Enable VR features through the OpenXR specification" ${_init_OPENXR})
+ option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
++if(APPLE)
++  # There's no OpenXR runtime in sight for macOS, neither is code well
++  # tested there -> disable it by default.
++  option(WITH_OPENXR        "Enable VR features through the OpenXR specification" OFF)
++else()
++  option(WITH_OPENXR        "Enable VR features through the OpenXR specification" ON)
++endif()
  
  # Compositor
  option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
diff --cc source/blender/python/intern/bpy_app_build_options.c
index 4331662eb31,39fcfa8b7bf..6ec67a504f3
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@@ -28,39 -28,38 +28,39 @@@ static PyTypeObject BlenderAppBuildOpti
  
  static PyStructSequence_Field app_builtopts_info_fields[] = {
      /* names mostly follow CMake options, lowercase, after WITH_ */
-     {(char *)"bullet", NULL},
-     {(char *)"codec_avi", NULL},
-     {(char *)"codec_ffmpeg", NULL},
-     {(char *)"codec_sndfile", NULL},
-     {(char *)"compositor", NULL},
-     {(char *)"cycles", NULL},
-     {(char *)"cycles_osl", NULL},
-     {(char *)"freestyle", NULL},
-     {(char *)"image_cineon", NULL},
-     {(char *)"image_dds", NULL},
-     {(char *)"image_hdr", NULL},
-     {(char *)"image_openexr", NULL},
-     {(char *)"image_openjpeg", NULL},
-     {(char *)"image_tiff", NULL},
-     {(char *)"input_ndof", NULL},
-     {(char *)"audaspace", NULL},
-     {(char *)"international", NULL},
-     {(char *)"openal", NULL},
-     {(char *)"opensubdiv", NULL},
-     {(char *)"sdl", NULL},
-     {(char *)"sdl_dynload", NULL},
-     {(char *)"jack", NULL},
-     {(char *)"libmv", NULL},
-     {(char *)"mod_fluid", NULL},
-     {(char *)"mod_oceansim", NULL},
-     {(char *)"mod_remesh", NULL},
-     {(char *)"mod_smoke", NULL},
-     {(char *)"collada", NULL},
-     {(char *)"opencolorio", NULL},
-     {(char *)"openmp", NULL},
-     {(char *)"openvdb", NULL},
-     {(char *)"alembic", NULL},
-     {(char *)"openxr", NULL},
+     {"bullet", NULL},
+     {"codec_avi", NULL},
+     {"codec_ffmpeg", NULL},
+     {"codec_sndfile", NULL},
+     {"compositor", NULL},
+     {"cycles", NULL},
+     {"cycles_osl", NULL},
+     {"freestyle", NULL},
+     {"image_cineon", NULL},
+     {"image_dds", NULL},
+     {"image_hdr", NULL},
+     {"image_openexr", NULL},
+     {"image_openjpeg", NULL},
+     {"image_tiff", NULL},
+     {"input_ndof", NULL},
+     {"audaspace", NULL},
+     {"international", NULL},
+     {"openal", NULL},
+     {"opensubdiv", NULL},
+     {"sdl", NULL},
+     {"sdl_dynload", NULL},
+     {"jack", NULL},
+     {"libmv", NULL},
+     {"mod_oceansim", NULL},
+     {"mod_remesh", NULL},
+     {"collada", NULL},
+     {"opencolorio", NULL},
+     {"openmp", NULL},
+     {"openvdb", NULL},
+     {"alembic", NULL},
+     {"usd", NULL},
+     {"fluid", NULL},
++    {"openxr", NULL},
      {NULL},
  };