Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 16:35:14 +0000 (18:35 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 16:35:14 +0000 (18:35 +0200)
commitf71efafe8fc43083dcf573d258a1a5511d522702
tree5d8f5e32c6a6a8aa43cb8679230b756328d5d8ad
parentdf22cd9ce160457bda1a976da4dd6e7079f36865
parentcfea9c261c2349e03c5ce38a04659479901ce815
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_text/text_ops.c