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)
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

1  2 
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_text/text_ops.c