diff options
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index b8f2ce1b2ea..46b7d717991 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -124,7 +124,7 @@ typedef struct SpaceButs { short mainb, mainbo, mainbuser; /* context tabs */ short re_align, align; /* align for panels */ short preview; /* preview is signal to refresh */ - /* texture context selector (material, lamp, particles, world, other)*/ + /* texture context selector (material, lamp, particles, world, other) */ short texture_context, texture_context_prev; char flag, pad[7]; @@ -147,7 +147,8 @@ typedef struct SpaceButs { #define CONTEXT_LOGIC 6 /* sbuts->mainb old (deprecated) */ -#define BUTS_VIEW 0 +#ifdef DNA_DEPRECATED_ALLOW +// #define BUTS_VIEW 0 #define BUTS_LAMP 1 #define BUTS_MAT 2 #define BUTS_TEX 3 @@ -159,9 +160,10 @@ typedef struct SpaceButs { #define BUTS_FPAINT 9 #define BUTS_RADIO 10 #define BUTS_SCRIPT 11 -#define BUTS_SOUND 12 +// #define BUTS_SOUND 12 #define BUTS_CONSTRAINT 13 -#define BUTS_EFFECTS 14 +// #define BUTS_EFFECTS 14 +#endif /* buts->mainb new */ typedef enum eSpaceButtons_Context { @@ -327,8 +329,10 @@ typedef struct SpaceIpo { short autosnap; /* time-transform autosnapping settings for Graph editor (eAnimEdit_AutoSnap in DNA_action_types.h) */ int flag; /* settings for Graph editor (eGraphEdit_Flag) */ + float cursorTime; /* time value for cursor (when in drivers mode; animation uses current frame) */ float cursorVal; /* cursor value (y-value, x-value is current frame) */ int around; /* pivot point for transforms */ + int pad; } SpaceIpo; @@ -587,7 +591,7 @@ typedef struct FileSelectParams { char renamefile[256]; char renameedit[256]; /* annoying but the first is only used for initialization */ - char filter_glob[64]; /* list of filetypes to filter */ + char filter_glob[256]; /* list of filetypes to filter */ char filter_search[64]; /* text items' name must match to be shown. */ int filter_id; /* same as filter, but for ID types (aka library groups). */ @@ -646,7 +650,7 @@ typedef struct SpaceFile { short systemnr, system_bookmarknr; } SpaceFile; -/* FSMenuEntry's without paths indicate seperators */ +/* FSMenuEntry's without paths indicate separators */ typedef struct FSMenuEntry { struct FSMenuEntry *next; @@ -849,7 +853,7 @@ typedef struct FileDirEntryArr { /* FileDirEntry.status */ enum { - ASSET_STATUS_LOCAL = 1 << 0, /* If active uuid is available localy/immediately. */ + ASSET_STATUS_LOCAL = 1 << 0, /* If active uuid is available locally/immediately. */ ASSET_STATUS_LATEST = 1 << 1, /* If active uuid is latest available version. */ }; @@ -920,7 +924,7 @@ typedef enum eSpaceImage_Mode { /* SpaceImage->sticky * Note DISABLE should be 0, however would also need to re-arrange icon order, - * also, sticky loc is the default mode so this means we don't need to 'do_versons' */ + * also, sticky loc is the default mode so this means we don't need to 'do_versions' */ typedef enum eSpaceImage_Sticky { SI_STICKY_LOC = 0, SI_STICKY_DISABLE = 1, @@ -953,7 +957,7 @@ typedef enum eSpaceImage_Flag { /* SI_DEPRECATED5 = (1 << 18), */ /* deprecated */ /* this means that the image is drawn until it reaches the view edge, - * in the image view, its unrelated to the 'tile' mode for texface + * in the image view, it's unrelated to the 'tile' mode for texface */ SI_DRAW_TILE = (1 << 19), SI_SMOOTH_UV = (1 << 20), @@ -964,7 +968,11 @@ typedef enum eSpaceImage_Flag { SI_COLOR_CORRECTION = (1 << 24), SI_NO_DRAW_TEXPAINT = (1 << 25), - SI_DRAW_METADATA = (1 << 26) + SI_DRAW_METADATA = (1 << 26), + + SI_SHOW_R = (1 << 27), + SI_SHOW_G = (1 << 28), + SI_SHOW_B = (1 << 29), } eSpaceImage_Flag; /* Text Editor ============================================ */ |