diff options
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 287dcf433eb..e120cd14775 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1,6 +1,4 @@ -/** - * blenlib/DNA_space_types.h (mar-2001 nzc) - * +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -30,6 +28,11 @@ */ #ifndef DNA_SPACE_TYPES_H #define DNA_SPACE_TYPES_H +/** \file DNA_space_types.h + * \ingroup DNA + * \since mar-2001 + * \author nzc + */ #include "DNA_listBase.h" #include "DNA_color_types.h" /* for Histogram */ @@ -175,22 +178,19 @@ typedef struct FileSelectParams { char filter_glob[64]; /* list of filetypes to filter */ + int active_file; + int sel_first; + int sel_last; + + /* short */ short type; /* XXXXX for now store type here, should be moved to the operator */ short flag; /* settings for filter, hiding dots files,... */ short sort; /* sort order */ short display; /* display mode flag */ short filter; /* filter when (flags & FILE_FILTER) is true */ - /* XXX - temporary, better move to filelist */ - short active_bookmark; - - int active_file; - int selstate; - - /* short */ /* XXX --- still unused -- */ short f_fp; /* show font preview */ - short pad; char fp_str[8]; /* string to use for font preview */ /* XXX --- end unused -- */ @@ -324,6 +324,9 @@ typedef struct SpaceText { char findstr[256]; /* ST_MAX_FIND_STR */ char replacestr[256]; /* ST_MAX_FIND_STR */ + short margin_column; /* column number to show right margin at */ + char pad[6]; + void *drawcache; /* cache for faster drawing */ } SpaceText; @@ -400,6 +403,7 @@ typedef struct SpaceNode { int treetype; /* treetype: as same nodetree->type */ short texfrom; /* texfrom object, world or brush */ short recalc; /* currently on 0/1, for auto compo */ + ListBase linkdrag; /* temporary data for modal linking operator */ struct bGPdata *gpd; /* grease-pencil data */ } SpaceNode; @@ -636,6 +640,7 @@ typedef struct SpaceSound { #define SB_TEXC_MAT_OR_LAMP 0 #define SB_TEXC_WORLD 1 #define SB_TEXC_BRUSH 2 +#define SB_TEXC_PARTICLES 3 /* sbuts->align */ #define BUT_FREE 0 @@ -704,9 +709,7 @@ enum FileSortTypeE { #define FILE_BOOKMARKS 512 #define FILE_GROUP_INSTANCE 1024 -/* files in filesel list: 2=ACTIVE */ -#define EDITING (1<<0) -#define ACTIVEFILE (1<<1) +/* files in filesel list: file types */ #define BLENDERFILE (1<<2) #define BLENDERFILE_BACKUP (1<<3) #define IMAGEFILE (1<<4) @@ -721,6 +724,13 @@ enum FileSortTypeE { #define COLLADAFILE (1<<13) #define OPERATORFILE (1<<14) /* from filter_glob operator property */ + +/* Selection Flags in filesel: struct direntry, unsigned char selflag */ +#define ACTIVE_FILE (1<<1) +#define HILITED_FILE (1<<2) +#define SELECTED_FILE (1<<3) +#define EDITING_FILE (1<<4) + /* SpaceImage->dt_uv */ #define SI_UVDT_OUTLINE 0 #define SI_UVDT_DASH 1 @@ -813,6 +823,8 @@ enum { // execution (see BPY_main.c) #define ST_FIND_WRAP 0x0020 #define ST_FIND_ALL 0x0040 +#define ST_SHOW_MARGIN 0x0080 +#define ST_MATCH_CASE 0x0100 /* stext->findstr/replacestr */ |