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

[Bastien Montagne]

Commit: 324e10e76af43788c282e5a08eb18fde48bb488b
Author: Bastien Montagne
Date:   Mon Jun 18 12:32:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB324e10e76af43788c282e5a08eb18fde48bb488b

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/makesrna/intern/rna_space.c

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index 5ce27a533b8,c69679185aa..4558cd9c053
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -249,6 -257,10 +249,9 @@@ const EnumPropertyItem rna_enum_file_so
  #include "DNA_screen_types.h"
  #include "DNA_userdef_types.h"
  
 -#include "BLI_math.h"
+ #include "BLI_path_util.h"
+ #include "BLI_string.h"
+ 
  #include "BKE_animsys.h"
  #include "BKE_brush.h"
  #include "BKE_colortools.h"