Merge branch 'master' into blender2.8
This commit is contained in:
commit
3f2090f401
@ -1,6 +1,6 @@
|
|||||||
# ######## Global feature set settings ########
|
# ######## 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.
|
# Detect which libc we'll be linking against.
|
||||||
# Some of the paths will depend on this
|
# Some of the paths will depend on this
|
||||||
|
@ -59,7 +59,7 @@ if 'cmake' in builder:
|
|||||||
bits = 64
|
bits = 64
|
||||||
|
|
||||||
# Config file to be used (relative to blender's sources root)
|
# 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
|
cmake_cuda_config_file = None
|
||||||
|
|
||||||
# Set build options.
|
# Set build options.
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
set(WITH_ALEMBIC ON CACHE BOOL "" FORCE)
|
set(WITH_ALEMBIC ON CACHE BOOL "" FORCE)
|
||||||
|
set(WITH_ASSERT_ABORT OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_BUILDINFO ON CACHE BOOL "" FORCE)
|
set(WITH_BUILDINFO ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_BULLET ON CACHE BOOL "" FORCE)
|
set(WITH_BULLET ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
|
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
|
||||||
|
@ -1903,7 +1903,7 @@ ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else if (keycode != 0) {
|
||||||
GHOST_ASSERT(false, "KeyCode out of range!");
|
GHOST_ASSERT(false, "KeyCode out of range!");
|
||||||
}
|
}
|
||||||
return GHOST_kKeyUnknown;
|
return GHOST_kKeyUnknown;
|
||||||
|
Loading…
Reference in New Issue
Block a user