Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Mon, 22 Oct 2018 16:19:06 +0000 (10:19 -0600)
committerRay Molenkamp <github@lazydodo.com>
Mon, 22 Oct 2018 16:19:06 +0000 (10:19 -0600)
commit4bf4da12de92989d5708be8b6f14c3536e872836
tree350389c61578756f963a581ed140c3bf41264e69
parent9d81e937d234f8c2be38550d25fcb0945066fb25
parent86dbbd156fafccea7bfcf3207c8486fb2098b341
Merge remote-tracking branch 'origin/master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
build_files/windows/parse_arguments.cmd
source/creator/CMakeLists.txt