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)
commitf4d6e66b25d154736f3e312de2df39702053f94a
tree7a9ea966e5099fea4c763d068118a977a31ca5e6
parent6528310543e347ed0c178872fb89692468a2c9b2
parent6cd0484de8c765e5ce0f2072c7b10af0794ce7f8
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/blenkernel/CMakeLists.txt