Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 09:04:54 +0000 (20:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 09:04:54 +0000 (20:04 +1100)
commit4ebcdff873cb71bb031155a9bddcc92dde8e6370
tree5ddce162a55368230322412b8170d5dec149da28
parent8181e4c812545a6412682e152f77a2e25054deb5
parent9466f8f53150659c8aed6cced7f66b11a794a4a4
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_view.c