Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 13:21:54 +0000 (00:21 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 13:21:54 +0000 (00:21 +1100)
commit1c0905be0f6c36524adeb43237d9541bb1e6dc1e
tree7fc7a5f1d9adf13c5a589f938b568b1440264f23
parent1c7cfa025c87e8f31790b48cbb189949f7949ad1
parentefdd8f12a097be6d9b75948ead26fa5dc0181755
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_win32.cmake