Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Nov 2018 11:00:36 +0000 (12:00 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Nov 2018 11:00:36 +0000 (12:00 +0100)
commit0970ed0550200bb743f0a7207623927d0b487c2f
treeed55bcd50fd2a1491a0e9edf7fb82f6a60224b15
parent3a038db576e97c0e720a92af05a218ed71ed121a
parentacd1d1a31d1ac7343f8656dbd3b04c5342f306be
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/config/blender_full.cmake
build_files/cmake/config/blender_lite.cmake
build_files/cmake/config/blender_release.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/app/CMakeLists.txt