Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2018 06:21:38 +0000 (08:21 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2018 06:21:50 +0000 (08:21 +0200)
commita52152c59fa28993dd9e82866cf69a76cc63d9d9
treefa91891bc6b2b87432511d7bc243508781f6af62
parentdd67d703a749649fb13e4a5b5c993a1f2785d06b
parentae01df5779de8ba76f46e51449891e567701d2d8
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/Modules/FindGLEW.cmake
build_files/cmake/Modules/FindSndFile.cmake
build_files/cmake/config/blender_headless.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake