Merge remote-tracking branch 'origin/master' into blender2.8

This commit is contained in:
Ray Molenkamp 2018-06-18 13:40:39 -06:00
commit 30c383fd35

@ -2,6 +2,7 @@ if NOT "%verbose%" == "" (
echo Detecting msvc 2017
)
set BUILD_VS_VER=15
set BUILD_VS_YEAR=2017
set ProgramFilesX86=%ProgramFiles(x86)%
if not exist "%ProgramFilesX86%" set ProgramFilesX86=%ProgramFiles%