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)
1  2 
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

Simple merge