Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 Jan 2018 00:45:34 +0000 (11:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 Jan 2018 00:45:34 +0000 (11:45 +1100)
commit7389bfdeb0691065e20977d5960517eaa8775993
tree5958a1ba37d3f6f5e89f0c72cda7b7522bbdb69f
parente6064b412a6ed703d19028e2f05420af3bf45121
parentbd5696f85718609bd42e46441df4bcdb0cdc4b76
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_edit.c