Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 03:09:27 +0000 (14:09 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 03:09:27 +0000 (14:09 +1100)
1  2 
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/render/intern/source/external_engine.c
source/blender/windowmanager/intern/wm_files.c

Simple merge