Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 06:46:42 +0000 (17:46 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 06:46:42 +0000 (17:46 +1100)
commit264691e5630fcd11516272c98bcdf2a2c980dfa3
treedd4e72696dc2c9f4ff478339ccca8cf714eb1e03
parent34e76c7162de721e73262efe138ac28f74936eec
parent860939ccc2c11f0503588d35e2b23326997c9768
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/scene.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/python/bmesh/bmesh_py_types.c