Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 30 Nov 2017 07:30:41 +0000 (18:30 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 30 Nov 2017 07:30:41 +0000 (18:30 +1100)
commit03a5eccc945497da3cffafdf050c17fb4ccf999c
treeb451841a8bb0e614184de8a530322f4e45736b51
parent84d39ab97bba5d4885a062363c8b3f3d28cb7da7
parent28d2148b09a2d975876f4418bd5ba15ab5edea8d
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_unix.cmake
intern/cycles/device/device_cuda.cpp
release/scripts/startup/bl_ui/properties_data_mesh.py
source/blender/editors/armature/armature_select.c