[Bf-blender-cvs] [97a4a8d0fb7] soc-2020-xr-input: merge

[Peter Klimenko]

Commit: 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14
Author: Peter Klimenko
Date:   Fri Jul 31 18:45:15 2020 +1000
Branches: soc-2020-xr-input
https://developer.blender.org/rB97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14

merge

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



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

diff --cc cmake-build-debug/CMakeCache.txt
index 00000000000,00000000000..c26299d42e8
new file mode 100644
--- /dev/null
+++ b/cmake-build-debug/CMakeCache.txt
@@@ -1,0 -1,0 +1,823 @@@
++# This is the CMakeCache file.
++# For build in directory: e:/code/blender-git/blender/cmake-build-debug
++# It was generated by CMake: C:/Program Files/JetBrains/CLion 2020.1.1/bin/cmake/win/bin/cmake.exe
++# You can edit this file to change values found and used by cmake.
++# If you do not want to change any of the values, simply exit the editor.
++# If you do want to change a value, simply edit, save, and exit the editor.
++# The syntax for the file is as follows:
++# KEY:TYPE=VALUE
++# KEY is the name of a variable in the cache.
++# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
++# VALUE is the current value for the KEY.
++
++########################
++# EXTERNAL cache entries
++########################
++
++//Use instead of the current date for reproducible builds (empty
++// string disables this option)
++BUILDINFO_OVERRIDE_DATE:STRING=
++
++//Use instead of the current time for reproducible builds (empty
++// string disables this option)
++BUILDINFO_OVERRIDE_TIME:STRING=
++
++//Value Computed by CMake
++Blender_BINARY_DIR:STATIC=E:/code/blender-git/blender/cmake-build-debug
++
++//Value Computed by CMake
++Blender_SOURCE_DIR:STATIC=E:/code/blender-git/blender
++
++//Choose the type of build, options are: None Debug Release RelWithDebInfo
++// MinSizeRel ...
++CMAKE_BUILD_TYPE:STRING=Debug
++
++//Id string of the compiler for the CodeBlocks IDE. Automatically
++// detected when left empty
++CMAKE_CODEBLOCKS_COMPILER_ID:STRING=
++
++//The CodeBlocks executable
++CMAKE_CODEBLOCKS_EXECUTABLE:FILEPATH=CMAKE_CODEBLOCKS_EXECUTABLE-NOTFOUND
++
++//Additional command line arguments when CodeBlocks invokes make.
++// Enter e.g. -j<some_number> to get parallel builds
++CMAKE_CODEBLOCKS_MAKE_ARGUMENTS:STRING=
++
++//Enable/Disable color output during build.
++CMAKE_COLOR_MAKEFILE:BOOL=ON
++
++//CXX compiler
++CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.25.28610/bin/Hostx86/x86/cl.exe
++
++//Flags used by the CXX compiler during all build types.
++CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
++
++//Flags used by the CXX compiler during DEBUG builds.
++CMAKE_CXX_FLAGS_DEBUG:STRING=/MDd /Zi /Ob0 /Od /RTC1
++
++//Flags used by the CXX compiler during MINSIZEREL builds.
++CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /DNDEBUG
++
++CMAKE_CXX_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /DNDEBUG
++
++//Flags used by the CXX compiler during RELWITHDEBINFO builds.
++CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
++
++//Libraries linked by default with all C++ applications.
++CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
++
++//C compiler
++CMAKE_C_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.25.28610/bin/Hostx86/x86/cl.exe
++
++//Flags used by the C compiler during all build types.
++CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
++
++//Flags used by the C compiler during DEBUG builds.
++CMAKE_C_FLAGS_DEBUG:STRING=/MDd /Zi /Ob0 /Od /RTC1
++
++//Flags used by the C compiler during MINSIZEREL builds.
++CMAKE_C_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /DNDEBUG
++
++CMAKE_C_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /DNDEBUG
++
++//Flags used by the C compiler during RELWITHDEBINFO builds.
++CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
++
++//Libraries linked by default with all C applications.
++CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
++
++//Flags used by the linker during all build types.
++CMAKE_EXE_LINKER_FLAGS:STRING=/machine:X86
++
++//Flags used by the linker during DEBUG builds.
++CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL
++
++//Flags used by the linker during MINSIZEREL builds.
++CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during RELEASE builds.
++CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during RELWITHDEBINFO builds.
++CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
++
++//default install path
++CMAKE_INSTALL_PREFIX:PATH=E:/code/blender-git/blender/cmake-build-debug/bin/${BUILD_TYPE}
++
++//Path to a program.
++CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.25.28610/bin/Hostx86/x86/link.exe
++
++//Program used to build from makefiles.
++CMAKE_MAKE_PROGRAM:STRING=nmake
++
++//Flags used by the linker during the creation of modules during
++// all build types.
++CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:X86
++
++//Flags used by the linker during the creation of modules during
++// DEBUG builds.
++CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL
++
++//Flags used by the linker during the creation of modules during
++// MINSIZEREL builds.
++CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during the creation of modules during
++// RELEASE builds.
++CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during the creation of modules during
++// RELWITHDEBINFO builds.
++CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
++
++//Path to a program.
++CMAKE_MT:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/mt.exe
++
++//Value Computed by CMake
++CMAKE_PROJECT_DESCRIPTION:STATIC=
++
++//Value Computed by CMake
++CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
++
++//Value Computed by CMake
++CMAKE_PROJECT_NAME:STATIC=Blender
++
++//RC compiler
++CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/rc.exe
++
++//Flags for Windows Resource Compiler during all build types.
++CMAKE_RC_FLAGS:STRING=-DWIN32
++
++//Flags for Windows Resource Compiler during DEBUG builds.
++CMAKE_RC_FLAGS_DEBUG:STRING=-D_DEBUG
++
++//Flags for Windows Resource Compiler during MINSIZEREL builds.
++CMAKE_RC_FLAGS_MINSIZEREL:STRING=
++
++//Flags for Windows Resource Compiler during RELEASE builds.
++CMAKE_RC_FLAGS_RELEASE:STRING=
++
++//Flags for Windows Resource Compiler during RELWITHDEBINFO builds.
++CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING=
++
++//Flags used by the linker during the creation of shared libraries
++// during all build types.
++CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:X86
++
++//Flags used by the linker during the creation of shared libraries
++// during DEBUG builds.
++CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL
++
++//Flags used by the linker during the creation of shared libraries
++// during MINSIZEREL builds.
++CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during the creation of shared libraries
++// during RELEASE builds.
++CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
++
++//Flags used by the linker during the creation of shared libraries
++// during RELWITHDEBINFO builds.
++CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
++
++//If set, runtime paths are not added when installing shared libraries,
++// but are added when building.
++CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
++
++//If set, runtime paths are not added when using shared libraries.
++CMAKE_SKIP_RPATH:BOOL=NO
++
++//Flags used by the linker during the creation of static libraries
++// during all build types.
++CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:X86
++
++//Flags used by the linker during the creation of static libraries
++// during DEBUG builds.
++CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
++
++//Flags used by the linker during the creation of static libraries
++// during MINSIZEREL builds.
++CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
++
++//Flags used by the linker during the creation of static libraries
++// during RELEASE builds.
++CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
++
++//Flags used by the linker during the creation of static libraries
++// during RELWITHDEBINFO builds.
++CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
++
++//If this value is on, makefiles will be generated without the
++// .SILENT directive, and all commands will be echoed to the console
++// during the make.  This is useful for debugging only. With Visual
++// Studio IDE projects all commands are done without /nologo.
++CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
++
++//Use instead of the standard packagename (empty string disables
++// this option)
++CPACK_OVERRIDE_PACKAGENAME:STRING=
++
++//CUDA architectures to build binaries for
++CYCLES_CUDA_BINARIES_ARCH:STRING=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75
++
++//Git command line client
++GIT_EXECUTABLE:FILEPATH=C:/Program Files/Git/cmd/git.exe
++
++//Link with LLVM static libraries
++LLVM_STATIC:BOOL=OFF
++
++//Path to a file.
++MSVC_REDIST_DIR:PATH=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Redist/MSVC/14.25.28508
++
++//Run given CMake script after installation process
++POSTINSTALL_SCRIPT:BOOL=OFF
++
++//Python executable to run unit tests
++TEST_PYTHON_EXE:PATH=
++
++//Path to a file.
++WINDOWS_KITS_DIR:PATH=C:/Program Files (x86)/Windows Kits/10
++
++//Include the files needed for debugging python scripts with visual
++// studio 2017+.
++WINDOWS_PYTHON_DEBUG:BOOL=OFF
++
++//Organize the visual studio projects according to source folder
++// structure.
++WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS:BOOL=ON
++
++//Organize the source files in filters matching the source folders.
++WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS:BOOL=ON
++
++//Enable Alembic Support
++WITH_ALEMBIC:BOOL=ON
++
++//Call abort() when raising an assertion through BLI_assert()
++WITH_ASSERT_ABORT:BOOL=ON
++
++//Build with blenders audio library (only disable if you know what
++// you're doing!)
++WITH_AUDASPACE:BOOL=ON
++
++//Build blender (disable to build only the blender player)
++WITH_BLENDER:BOOL=ON
++
++//Enable features depending on boost
++WITH_BOOST:BOOL=ON
++
++//Include extra build details (only disable for de

@@ Diff output truncated at 10240 characters. @@