Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Sep 2017 06:50:59 +0000 (16:50 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Sep 2017 06:50:59 +0000 (16:50 +1000)
commitb41d34040b45b6634c3e81c93003326a3bf1d49a
tree057360c7f476a25c99df9ba790a64968bdeec195
parent518e7685790f28789bbe795f370ee3b1a5f776c6
parent47b7f06d0e13efba04290d4cfa8c28d2342eebf7
Merge branch 'master' into blender2.8
build_files/buildbot/config/blender_linux.cmake
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/gpu/intern/gpu_draw.c