Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesdna / DNA_space_types.h
index 693917939efb8b125260a9a92d5adf145824a4b1..39ac3f72b94eb7568788b345204bd8b40b4ef480 100644 (file)
@@ -126,7 +126,9 @@ typedef struct SpaceButs {
        short preview;                  /* preview is signal to refresh */
        /* texture context selector (material, lamp, particles, world, other) */
        short texture_context, texture_context_prev;
-       char flag, pad[7];
+       char flag;
+       char collection_context;
+       char pad[6];
        
        void *path;                     /* runtime */
        int pathflag, dataicon;         /* runtime */
@@ -180,8 +182,10 @@ typedef enum eSpaceButtons_Context {
        BCONTEXT_MODIFIER = 10,
        BCONTEXT_CONSTRAINT = 11,
        BCONTEXT_BONE_CONSTRAINT = 12,
-       BCONTEXT_RENDER_LAYER = 13,
-       
+       BCONTEXT_VIEW_LAYER = 13,
+       BCONTEXT_COLLECTION = 14,
+       BCONTEXT_WORKSPACE = 15,
+
        /* always as last... */
        BCONTEXT_TOT
 } eSpaceButtons_Context;
@@ -206,6 +210,12 @@ typedef enum eSpaceButtons_Texture_Context {
        SB_TEXC_LINESTYLE = 5,
 } eSpaceButtons_Texture_Context;
 
+/* sbuts->collection_context */
+typedef enum eSpaceButtons_Collection_Context {
+       SB_COLLECTION_CTX_VIEW_LAYER = 0,
+       SB_COLLECTION_CTX_GROUP = 1,
+} eSpaceButtons_Collection_Context;
+
 /* sbuts->align */
 typedef enum eSpaceButtons_Align {
        BUT_FREE = 0,
@@ -273,21 +283,23 @@ typedef enum eSpaceOutliner_Flag {
 
 /* SpaceOops->outlinevis */
 typedef enum eSpaceOutliner_Mode {
-       SO_ALL_SCENES = 0,
-       SO_CUR_SCENE = 1,
-       SO_VISIBLE = 2,
-       SO_SELECTED = 3,
-       SO_ACTIVE = 4,
-       SO_SAME_TYPE = 5,
-       SO_GROUPS = 6,
-       SO_LIBRARIES = 7,
-       /* SO_VERSE_SESSION = 8, */  /* deprecated! */
-       /* SO_VERSE_MS = 9, */       /* deprecated! */
-       SO_SEQUENCE = 10,
-       SO_DATABLOCKS = 11,
-       SO_USERDEF = 12,
-       /* SO_KEYMAP = 13, */        /* deprecated! */
-       SO_ID_ORPHANS = 14,
+       SO_ALL_SCENES     = 0,
+       SO_CUR_SCENE      = 1,
+       SO_VISIBLE        = 2,
+       SO_SELECTED       = 3,
+       SO_ACTIVE         = 4,
+       SO_SAME_TYPE      = 5,
+       SO_GROUPS         = 6,
+       SO_LIBRARIES      = 7,
+       /* SO_VERSE_SESSION  = 8, */  /* deprecated! */
+       /* SO_VERSE_MS       = 9, */  /* deprecated! */
+       SO_SEQUENCE       = 10,
+       SO_DATABLOCKS     = 11,
+       SO_USERDEF        = 12,
+       /* SO_KEYMAP      = 13, */    /* deprecated! */
+       SO_ID_ORPHANS     = 14,
+       SO_ACT_LAYER      = 15,
+       SO_COLLECTIONS    = 16,
 } eSpaceOutliner_Mode;
 
 /* SpaceOops->storeflag */
@@ -715,7 +727,7 @@ typedef enum eFileSel_Params_Flag {
        FILE_LINK           = (1 << 2),
        FILE_HIDE_DOT       = (1 << 3),
        FILE_AUTOSELECT     = (1 << 4),
-       FILE_ACTIVELAY      = (1 << 5),
+       FILE_ACTIVE_COLLECTION = (1 << 5),
 /*  FILE_ATCURSOR       = (1 << 6), */ /* deprecated */
        FILE_DIRSEL_ONLY    = (1 << 7),
        FILE_FILTER         = (1 << 8),
@@ -944,7 +956,7 @@ typedef enum eSpaceImage_Sticky {
 /* SpaceImage->flag */
 typedef enum eSpaceImage_Flag {
 /*     SI_BE_SQUARE          = (1 << 0), */  /* deprecated */
-       SI_EDITTILE           = (1 << 1),     /* XXX - not used but should be? */
+/*     SI_EDITTILE           = (1 << 1), */  /* deprecated */
        SI_CLIP_UV            = (1 << 2),
 /*     SI_DRAWTOOL           = (1 << 3), */  /* deprecated */
        SI_NO_DRAWFACES       = (1 << 4),