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)
commit4913e47aa0107cbe1daf06e8020a60916ea883a3
tree29cf5e0671027f74296d866cff0df66267bd09c8
parentb7016e69b3fff44d623f8413f9ebd4f7216a9b9b
parent7e4c23e4d7a3a27a49930824c822b679416724f6
Merge branch 'master' into blender2.8
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