diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:59:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 17:02:53 +0300 |
| commit | 8f670dd855b1d81fcf619b3b94ba4bfaf51e896d (patch) | |
| tree | 681c0dabf0af6e17ead533d174fde08e55e9cd0f /build_files | |
| parent | 9d037153f70c9bcc665fffa4971d1517044dbf29 (diff) | |
| parent | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_preview.c
source/blender/makesrna/intern/rna_object.c
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/windows/parse_arguments.cmd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 016bc875c3b..a8956d350ae 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -40,6 +40,7 @@ if NOT "%1" == "" ( set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% set WITH_CLANG=1 ) else if "%1" == "release" ( + set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" set TARGET=Release ) else if "%1" == "x86" ( set BUILD_ARCH=x86 |