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

[Campbell Barton]

Commit: e0903e20a7010e70706a062655003aefcfc18687
Author: Campbell Barton
Date:   Tue May 15 11:14:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe0903e20a7010e70706a062655003aefcfc18687

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesdna/DNA_space_types.h
index 292120d1f6e,7de5d6267b6..e3ebdd079ca
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -1386,9 -1377,8 +1385,9 @@@ typedef enum eSpace_Type 
  	SPACE_CONSOLE  = 18,
  	SPACE_USERPREF = 19,
  	SPACE_CLIP     = 20,
 +	SPACE_TOPBAR   = 21,
  
- 	SPACEICONMAX = SPACE_TOPBAR
 -	SPACE_TYPE_LAST = SPACE_CLIP
++	SPACE_TYPE_LAST = SPACE_TOPBAR
  } eSpace_Type;
  
  /* use for function args */