[Bf-blender-cvs] [f71efafe8fc] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: f71efafe8fc43083dcf573d258a1a5511d522702
Author: Bastien Montagne
Date:   Thu May 31 18:35:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf71efafe8fc43083dcf573d258a1a5511d522702

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

===================================================================



===================================================================