Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 13:42:38 +0000 (14:42 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 13:42:38 +0000 (14:42 +0100)
commit3ed0d5b4d4c06a0c88832525a7c55d21a04d86ff
tree44f3a8beab1bea3b712acbfc10edef1120d68f89
parent2bd62b076fac80e073557a7d1dff0e989aaa97c1
parentce927e15e0e3570a02834b6001519a024ca1e2b6
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
intern/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/creator/creator.c