[Bf-blender-cvs] [0028f7cf0f4] gsoc-2018-many-light-sampling: Merge branch 'master' into gsoc-2018-many-light-sampling

[Erik Englesson]

Commit: 0028f7cf0f41211d183853460e544830068badb0
Author: Erik Englesson
Date:   Fri Jun 8 15:21:09 2018 +0200
Branches: gsoc-2018-many-light-sampling
https://developer.blender.org/rB0028f7cf0f41211d183853460e544830068badb0

Merge branch 'master' into gsoc-2018-many-light-sampling

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



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

diff --cc build_files/windows/configure_msbuild.cmd
index f06f3e317ee,f8c2a87de8e..25110e822ab
--- a/build_files/windows/configure_msbuild.cmd
+++ b/build_files/windows/configure_msbuild.cmd
@@@ -64,4 -71,4 +71,4 @@@ echo msbuild 
  	/property:Configuration=%BUILD_TYPE% ^
  	/verbosity:minimal ^
  	/p:platform=%MSBUILD_PLATFORM% >> %BUILD_DIR%\rebuild.cmd
--echo echo %%TIME%% ^>^> buildtime.txt >> %BUILD_DIR%\rebuild.cmd
++echo echo %%TIME%% ^>^> buildtime.txt >> %BUILD_DIR%\rebuild.cmd
diff --cc build_files/windows/configure_ninja.cmd
index f882ca3dbf0,224d761adf6..fb57dcca9a5
--- a/build_files/windows/configure_ninja.cmd
+++ b/build_files/windows/configure_ninja.cmd
@@@ -61,4 -77,4 +77,4 @@@ if "%MUST_CONFIGURE%"=="1" 
  echo call "%VCVARS%" %BUILD_ARCH% > %BUILD_DIR%\rebuild.cmd
  echo echo %%TIME%% ^> buildtime.txt >> %BUILD_DIR%\rebuild.cmd
  echo ninja install >> %BUILD_DIR%\rebuild.cmd 
--echo echo %%TIME%% ^>^> buildtime.txt >> %BUILD_DIR%\rebuild.cmd
++echo echo %%TIME%% ^>^> buildtime.txt >> %BUILD_DIR%\rebuild.cmd
diff --cc build_files/windows/parse_arguments.cmd
index a8956d350ae,8a6d743978d..8654e8a7bea
--- a/build_files/windows/parse_arguments.cmd
+++ b/build_files/windows/parse_arguments.cmd
@@@ -79,4 -85,4 +85,4 @@@ if NOT "%1" == "" 
  	goto argv_loop
  )
  :EOF
--exit /b 0
++exit /b 0