Merge branch 'master' into blender2.8

2018-05-15 11:14:33 +02:00
parent f1bc899146 3eb9cc69f2
commit e0903e20a7
1 changed files with 1 additions and 2 deletions
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -1292,7 +1292,6 @@ typedef struct SpaceClip {
 	MaskSpaceInfo mask_info;
 } SpaceClip;

-
 /* SpaceClip->flag */
 typedef enum eSpaceClip_Flag {
 	SC_SHOW_MARKER_PATTERN      = (1 << 0),
@@ -1388,7 +1387,7 @@ typedef enum eSpace_Type {
 	SPACE_CLIP     = 20,
 	SPACE_TOPBAR   = 21,

-	SPACEICONMAX = SPACE_TOPBAR
+	SPACE_TYPE_LAST = SPACE_TOPBAR
 } eSpace_Type;

 /* use for function args */