Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Feb 2017 09:56:28 +0000 (10:56 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Feb 2017 09:56:28 +0000 (10:56 +0100)
commitb46b2834b9596b9a7c026dd2e041a329cda9bb59
tree2b1c36f3ab62159a511b67dacc422542d0f91b87
parent53a9dec2bfecc8a2c863d850bcec05aafb008bac
parent9dd194716b0f43fa02ae6cd32ada556d8d622390
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/curve/editcurve.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/modifiers/intern/MOD_displace.c
source/creator/creator_args.c