bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel 2018-08-31 13:00:19 +02:00
commit 3f2090f401
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/buildbot/config/blender_linux.cmake
View File

@ -1,6 +1,6 @@
# ######## Global feature set settings ########
include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
# Detect which libc we'll be linking against.
# Some of the paths will depend on this

2
build_files/buildbot/slave_compile.py
View File

@ -59,7 +59,7 @@ if 'cmake' in builder:
bits = 64
# Config file to be used (relative to blender's sources root)
cmake_config_file = "build_files/cmake/config/blender_full.cmake"
cmake_config_file = "build_files/cmake/config/blender_release.cmake"
cmake_cuda_config_file = None
# Set build options.

1
build_files/cmake/config/blender_release.cmake
View File

@ -5,6 +5,7 @@
#
set(WITH_ALEMBIC ON CACHE BOOL "" FORCE)
set(WITH_ASSERT_ABORT OFF CACHE BOOL "" FORCE)
set(WITH_BUILDINFO ON CACHE BOOL "" FORCE)
set(WITH_BULLET ON CACHE BOOL "" FORCE)
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)

2
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -1903,7 +1903,7 @@ ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode)
#endif
}
}
else {
else if (keycode != 0) {
GHOST_ASSERT(false, "KeyCode out of range!");
}
return GHOST_kKeyUnknown;