Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 11 Dec 2018 22:14:00 +0000 (15:14 -0700)
committerRay Molenkamp <github@lazydodo.com>
Tue, 11 Dec 2018 22:14:00 +0000 (15:14 -0700)
1  2 
build_files/cmake/platform/platform_win32.cmake
source/creator/CMakeLists.txt

Simple merge