forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
a9f9236670
@ -1,3 +1,9 @@
|
|||||||
|
ninja --version 1>NUL 2>&1
|
||||||
|
if %ERRORLEVEL% NEQ 0 (
|
||||||
|
echo "Ninja not detected in the path"
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
|
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Ninja" %TESTS_CMAKE_ARGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
|
||||||
|
|
||||||
if "%WITH_CLANG%" == "1" (
|
if "%WITH_CLANG%" == "1" (
|
||||||
|
@ -12,7 +12,12 @@ if not exist "%vs_where%" (
|
|||||||
goto FAIL
|
goto FAIL
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -products * -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do (
|
|
||||||
|
if NOT "%verbose%" == "" (
|
||||||
|
echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`
|
||||||
|
)
|
||||||
|
|
||||||
|
for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do (
|
||||||
if /i "%%i"=="installationPath" set VS_InstallDir=%%j
|
if /i "%%i"=="installationPath" set VS_InstallDir=%%j
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,6 +53,10 @@ if NOT "%1" == "" (
|
|||||||
) else if "%1" == "2017pre" (
|
) else if "%1" == "2017pre" (
|
||||||
set BUILD_VS_YEAR=2017
|
set BUILD_VS_YEAR=2017
|
||||||
set VSWHERE_ARGS=-prerelease
|
set VSWHERE_ARGS=-prerelease
|
||||||
|
set BUILD_VS_YEAR=2017
|
||||||
|
) else if "%1" == "2017b" (
|
||||||
|
set BUILD_VS_YEAR=2017
|
||||||
|
set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools
|
||||||
) else if "%1" == "2015" (
|
) else if "%1" == "2015" (
|
||||||
set BUILD_VS_YEAR=2015
|
set BUILD_VS_YEAR=2015
|
||||||
) else if "%1" == "2013" (
|
) else if "%1" == "2013" (
|
||||||
|
@ -23,7 +23,13 @@ echo - buildir [newdir] ^(override default build folder^)
|
|||||||
echo - x86 ^(override host auto-detect and build 32 bit code^)
|
echo - x86 ^(override host auto-detect and build 32 bit code^)
|
||||||
echo - x64 ^(override host auto-detect and build 64 bit code^)
|
echo - x64 ^(override host auto-detect and build 64 bit code^)
|
||||||
echo - 2013 ^(build with visual studio 2013^)
|
echo - 2013 ^(build with visual studio 2013^)
|
||||||
echo - 2015 ^(build with visual studio 2015^) [EXPERIMENTAL]
|
echo.
|
||||||
echo - 2017 ^(build with visual studio 2017^) [EXPERIMENTAL]
|
echo Experimental options
|
||||||
echo - 2017pre ^(build with visual studio 2017 pre-release^) [EXPERIMENTAL]
|
echo - 2015 ^(build with visual studio 2015^)
|
||||||
|
echo - 2017 ^(build with visual studio 2017^)
|
||||||
|
echo - 2017pre ^(build with visual studio 2017 pre-release^)
|
||||||
|
echo - 2017b ^(build with visual studio 2017 Build Tools^)
|
||||||
|
echo - clang ^(enable building with clang^)
|
||||||
|
echo - asan ^(enable asan when building with clang^)
|
||||||
|
echo - ninja ^(enable building with ninja instead of msbuild^)
|
||||||
echo.
|
echo.
|
||||||
|
@ -83,13 +83,14 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu, bContext *C)
|
|||||||
success = BKE_blendfile_read_from_memfile(C, &mfu->memfile, NULL, 0);
|
success = BKE_blendfile_read_from_memfile(C, &mfu->memfile, NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* restore */
|
/* Restore, bmain has been re-allocated. */
|
||||||
BLI_strncpy(bmain->name, mainstr, sizeof(bmain->name)); /* restore */
|
bmain = CTX_data_main(C);
|
||||||
|
BLI_strncpy(bmain->name, mainstr, sizeof(bmain->name));
|
||||||
G.fileflags = fileflags;
|
G.fileflags = fileflags;
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
/* important not to update time here, else non keyed tranforms are lost */
|
/* important not to update time here, else non keyed tranforms are lost */
|
||||||
DEG_on_visible_update(G.main, false);
|
DEG_on_visible_update(bmain, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
|
Loading…
Reference in New Issue
Block a user