Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jun 2018 12:42:25 +0000 (14:42 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jun 2018 12:42:25 +0000 (14:42 +0200)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/blenkernel/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge