Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
commit5a6a819b5d896da6a528615bce069d6ee9d9c85c
treebdbdc6f742ddda3f063df4655933d736a1644eef
parent727aab5af414ed774226fa5ee77aeef2ca61b520
parent457dc8d12ca79247349aa3e76457a9f45e73026e
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blender.c
source/blender/editors/curve/editcurve.c