[Bf-blender-cvs] [a53b90329a1] soc-2019-openxr: Merge branch 'master' into soc-2019-openxr
Julian Eisel
noreply at git.blender.org
Sat Aug 17 23:59:50 CEST 2019
Commit: a53b90329a12615255ef8eb55ea172f32e2048ee
Author: Julian Eisel
Date: Sat Aug 17 23:58:09 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBa53b90329a12615255ef8eb55ea172f32e2048ee
Merge branch 'master' into soc-2019-openxr
===================================================================
===================================================================
diff --cc CMakeLists.txt
index bb6e145520f,16ac322ebdd..da417266545
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1768,7 -1763,7 +1771,8 @@@ if(FIRST_RUN
info_cfg_option(WITH_CYCLES)
info_cfg_option(WITH_FREESTYLE)
info_cfg_option(WITH_OPENCOLORIO)
+ info_cfg_option(WITH_OPENXR)
+ info_cfg_option(WITH_OPENIMAGEDENOISE)
info_cfg_option(WITH_OPENVDB)
info_cfg_option(WITH_ALEMBIC)
diff --cc build_files/build_environment/install_deps.sh
index f1d69be4db6,a9118be93c7..c769177ae3a
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -26,17 -26,17 +26,17 @@@ ARGS=$(
getopt \
-o s:i:t:h \
--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
- with-all,with-opencollada,with-jack,with-embree,\
+ with-all,with-opencollada,with-jack,with-embree,with-oidn,\
-ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
+ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-openxr\
force-all,force-python,force-numpy,force-boost,\
force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
- force-ffmpeg,force-opencollada,force-alembic,force-embree,force-openxr,\
-force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,\
++force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,foce-openxr\
build-all,build-python,build-numpy,build-boost,\
build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
- build-ffmpeg,build-opencollada,build-alembic,build-embree,build-openxr,\
-build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,\
++build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-openxr\
skip-python,skip-numpy,skip-boost,\
skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
- skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-openxr \
-skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn \
++skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-openxr \
-- "$@" \
)
@@@ -297,12 -299,12 +308,15 @@@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENT
--skip-Embree
Unconditionally skip Embree installation/building.
+ --skip-oidn
+ Unconditionally skip OpenImageDenoise installation/building.
+
--skip-ffmpeg
- Unconditionally skip FFMpeg installation/building.
+ Unconditionally skip FFMpeg installation/building.\""
+ --skip-openxr
+ Unconditionally skip OpenXR-SDK installation/building.\""
+
##### Main Vars #####
DO_SHOW_DEPS=false
@@@ -594,9 -594,9 +616,10 @@@ while true; d
OPENVDB_FORCE_BUILD=true
OPENCOLLADA_FORCE_BUILD=true
EMBREE_FORCE_BUILD=true
+ OIDN_FORCE_BUILD=true
FFMPEG_FORCE_BUILD=true
ALEMBIC_FORCE_BUILD=true
+ OPENXR_FORCE_BUILD=true
shift; continue
;;
--build-python)
@@@ -661,9 -661,9 +687,10 @@@
OPENVDB_FORCE_REBUILD=true
OPENCOLLADA_FORCE_REBUILD=true
EMBREE_FORCE_REBUILD=true
+ OIDN_FORCE_REBUILD=true
FFMPEG_FORCE_REBUILD=true
ALEMBIC_FORCE_REBUILD=true
+ OPENXR_FORCE_REBUILD=true
shift; continue
;;
--force-python)
diff --cc build_files/cmake/config/blender_full.cmake
index 6523fc97126,75c5e0f34c1..d7034cb6f58
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -40,7 -40,7 +40,8 @@@ set(WITH_AUDASPACE ON CACHE
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE)
+ set(WITH_OPENIMAGEDENOISE ON CACHE BOOL "" FORCE)
+set(WITH_OPENXR ON CACHE BOOL "" FORCE)
set(WITH_OPENMP ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
set(WITH_OPENVDB ON CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_lite.cmake
index 38a500dbfa8,6596d1db674..9b926c7262c
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@@ -45,7 -45,7 +45,8 @@@ set(WITH_AUDASPACE OFF CACHE
set(WITH_OPENAL OFF CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE)
set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE)
+ set(WITH_OPENIMAGEDENOISE OFF CACHE BOOL "" FORCE)
+set(WITH_OPENXR OFF CACHE BOOL "" FORCE)
set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE)
set(WITH_OPENMP OFF CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_release.cmake
index eeaa158e9e8,08218a5e57c..b48a20a146d
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -41,7 -41,7 +41,8 @@@ set(WITH_AUDASPACE ON CACHE
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE)
+ set(WITH_OPENIMAGEDENOISE ON CACHE BOOL "" FORCE)
+set(WITH_OPENXR ON CACHE BOOL "" FORCE)
set(WITH_OPENMP ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
set(WITH_OPENVDB ON CACHE BOOL "" FORCE)
diff --cc source/blender/windowmanager/CMakeLists.txt
index f05ea317832,ddd0ddb46da..866ec1c9d8a
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@@ -69,9 -69,9 +69,10 @@@ set(SR
intern/wm_operators.c
intern/wm_panel_type.c
intern/wm_playanim.c
+ intern/wm_splash_screen.c
intern/wm_stereo.c
intern/wm_subwindow.c
+ intern/wm_surface.c
intern/wm_toolsystem.c
intern/wm_tooltip.c
intern/wm_uilist_type.c
diff --cc source/blender/windowmanager/intern/wm_operators.c
index 451c03571b6,75d262f48a0..9c304b7ce81
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -3515,35 -3325,12 +3325,41 @@@ static void WM_OT_stereo3d_set(wmOperat
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
+ /** \} */
+
+#ifdef WITH_OPENXR
+static int wm_xr_session_toggle_exec(bContext *C, wmOperator *UNUSED(op))
+{
+ wmWindowManager *wm = CTX_wm_manager(C);
+
+ /* Lazy-create xr context - tries to dynlink to the runtime, reading active_runtime.json. */
+ if (wm_xr_context_ensure(C, wm) == false) {
+ return OPERATOR_CANCELLED;
+ }
+
+ wm_xr_session_toggle(C, wm->xr_context);
+
+ return OPERATOR_FINISHED;
+}
+
+static void WM_OT_xr_session_toggle(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Toggle VR Session";
+ ot->idname = "WM_OT_xr_session_toggle";
+ ot->description =
+ "Attempt to open a view for use with virtual reality headsets, or close it if already "
+ "opened";
+
+ /* callbacks */
+ ot->exec = wm_xr_session_toggle_exec;
+}
+#endif /* WITH_OPENXR */
+
+ /* -------------------------------------------------------------------- */
+ /** \name Operator Registration & Keymaps
+ * \{ */
+
void wm_operatortypes_register(void)
{
WM_operatortype_append(WM_OT_window_close);
More information about the Bf-blender-cvs
mailing list