Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 22 Feb 2018 14:22:44 +0000 (15:22 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 22 Feb 2018 14:22:44 +0000 (15:22 +0100)
commit4ee3d7e3ac359dd04f80af88a46c5f3b14f49708
tree33ed7ecc447a19b634a65d46eda3cb046f0dab8f
parent5aff002f7b3ad52f6a88dc0a3c2eac482b57da3e
parent0eee776e454f6b78ffa33b2ed8b19c747d8193ec
Merge branch 'master' into blender2.8

Conflicts:
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/transform/transform_conversions.c