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)
1  2 
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

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge