Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 19 Jun 2018 08:52:01 +0000 (10:52 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 19 Jun 2018 08:52:01 +0000 (10:52 +0200)
commitcaaf4e5a37119a4b479efaa8d9f00f0298646a25
tree089f98f8de2aa20fe225664ddb3a1bda4558538e
parent816817011feeb2980b050301680ccdb31aa2016f
parentb09a8203e98ebdae78d325453641f33a608cfaaa
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_image_proj.c