Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Mon, 28 May 2018 20:35:59 +0000 (14:35 -0600)
committerRay Molenkamp <github@lazydodo.com>
Mon, 28 May 2018 20:35:59 +0000 (14:35 -0600)
commit5d1a172783e65a6c4c52ad112aff64d3b63d0b6c
tree02be093686847beb79d430a197ae09b4b1055a69
parent66577c8732f4957e4afa5cafb18259ea589e74b6
parent81060ff6b26c22331d2066bb83d492bbe61e936c
Merge remote-tracking branch 'origin/master' into blender2.8
CMakeLists.txt
build_files/cmake/platform/platform_win32.cmake
source/blender/blenkernel/intern/rigidbody.c
source/blender/makesrna/intern/makesrna.c