Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 09:57:49 +0000 (11:57 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 09:57:49 +0000 (11:57 +0200)
commit43ce201125ff97e16a56b372a91442590498dacc
tree10b6ef3c41cab5b9cef0b93d99de0a14fca4157f
parent75188552a113f4dc226f21076f883ac3c11c9a98
parent42103a3eb8e9ee341c89310cc2343bc21b6ae7e2
Merge branch 'master' into blender2.8
source/blender/blenlib/CMakeLists.txt
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mesh/editmesh_loopcut.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/util/CMakeLists.txt
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/bmesh/bmesh_py_types_customdata.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c