Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 09:14:33 +0000 (11:14 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 09:14:33 +0000 (11:14 +0200)
1  2 
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 */