Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 19:43:51 +0000 (21:43 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 19:43:51 +0000 (21:43 +0200)
commit6f8a141fad8819739f0aa7b53c6c43a577571b28
tree4857f430e44e3ec70fecfc14b120a32b65d2dc29
parent0c41d61008f1cfb58b160d8459d8ffdb652871d8
parente77d2b4e3f1a1eb2072b29e1f9c6ab3ba3b175e5
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/windowmanager/intern/wm_files.c