Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-17 05:21:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-17 05:55:06 +0300
commitd72d2d4133ba578ee29e65cc99b01fab0ded0265 (patch)
tree431f413aa00fd1727a888af1f3c55d46bd02b68d /source/blender/makesdna/DNA_space_types.h
parent9149e8942107343fb31639406124428e6ff1a029 (diff)
DNA: clear / remove deprecated flags
- Clear deprecated flags for ID's: Scene, Sequence, World, Object & Mesh. - Clear deprecated flags for Spaces: outliner, 3D view & image. - Remove unused `Mesh.drawflag` - Remove unused `USER_ALLWINCODECS`, `USER_MMB_PASTE`. - Remove `V3D_SOLID_TEX` & `V3D_ZBUF_SELECT` - used in a few areas. - Flip `Object.empty_image_visibility_flag` (avoids do-version on each new flag) - Rename 'Backside' -> 'Back' in context of drawing - showing 'Back' makes sense.
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
-rw-r--r--source/blender/makesdna/DNA_space_types.h70
1 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index fd977a7dafb..ca89cf11441 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -208,8 +208,8 @@ typedef enum eSpaceButtons_Context {
typedef enum eSpaceButtons_Flag {
SB_PRV_OSA = (1 << 0),
SB_PIN_CONTEXT = (1 << 1),
- /* SB_WORLD_TEX = (1 << 2), */ /* not used anymore */
- /* SB_BRUSH_TEX = (1 << 3), */ /* not used anymore */
+ SB_FLAG_DEPRECATED_2 = (1 << 2),
+ SB_FLAG_DEPRECATED_3 = (1 << 3),
SB_TEX_USER_LIMITED = (1 << 3), /* Do not add materials, particles, etc. in TemplateTextureUser list. */
SB_SHADING_CONTEXT = (1 << 4),
} eSpaceButtons_Flag;
@@ -267,13 +267,13 @@ typedef enum eSpaceOutliner_Flag {
/* SpaceOops.filter */
typedef enum eSpaceOutliner_Filter {
- SO_FILTER_SEARCH = (1 << 0), /* Run-time flag. */
- /* SO_FILTER_ENABLE = (1 << 1), */ /* Deprecated */
+ SO_FILTER_SEARCH = (1 << 0), /* Run-time flag. */
+ SO_FILTER_DEPRECATED_1 = (1 << 1), /* cleared */
SO_FILTER_NO_OBJECT = (1 << 2),
SO_FILTER_NO_OB_CONTENT = (1 << 3), /* Not only mesh, but modifiers, constraints, ... */
SO_FILTER_NO_CHILDREN = (1 << 4),
- /* SO_FILTER_OB_TYPE = (1 << 5), */ /* Deprecated */
+ SO_FILTER_DEPRECATED_5 = (1 << 5), /* cleared */
SO_FILTER_NO_OB_MESH = (1 << 6),
SO_FILTER_NO_OB_ARMATURE = (1 << 7),
SO_FILTER_NO_OB_EMPTY = (1 << 8),
@@ -281,7 +281,7 @@ typedef enum eSpaceOutliner_Filter {
SO_FILTER_NO_OB_CAMERA = (1 << 10),
SO_FILTER_NO_OB_OTHERS = (1 << 11),
- /* SO_FILTER_OB_STATE = (1 << 12), */ /* Deprecated */
+ SO_FILTER_DEPRECATED_12 = (1 << 12), /* cleared */
SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */
SO_FILTER_OB_STATE_SELECTED = (1 << 14), /* Not set via DNA. */
SO_FILTER_OB_STATE_ACTIVE = (1 << 15), /* Not set via DNA. */
@@ -339,7 +339,7 @@ typedef enum eSpaceOutliner_Mode {
typedef enum eSpaceOutliner_StoreFlag {
/* cleanup tree */
SO_TREESTORE_CLEANUP = (1 << 0),
- /* SO_TREESTORE_REDRAW = (1 << 1), */ /* Deprecated */
+ SO_TREESTORE_DEPRECATED_1 = (1 << 1), /* cleared */
/* rebuild the tree, similar to cleanup,
* but defer a call to BKE_outliner_treehash_rebuild_from_treestore instead */
SO_TREESTORE_REBUILD = (1 << 2),
@@ -467,10 +467,11 @@ typedef struct SpaceNla {
/* SpaceNla.flag */
typedef enum eSpaceNla_Flag {
- /* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old versions */
-
+ SNLA_FLAG_DEPRECATED_0 = (1 << 0),
+ SNLA_FLAG_DEPRECATED_1 = (1 << 1),
/* draw timing in seconds instead of frames */
SNLA_DRAWTIME = (1 << 2),
+ SNLA_FLAG_DEPRECATED_3 = (1 << 3),
/* don't draw frame number beside frame indicator */
SNLA_NODRAWCFRANUM = (1 << 4),
/* don't draw influence curves on strips */
@@ -729,24 +730,23 @@ typedef enum eFileSel_Action {
FILE_SAVE = 1,
} eFileSel_Action;
-/* sfile->params->flag and simasel->flag */
+/* sfile->params->flag */
/* Note: short flag, also used as 16 lower bits of flags in link/append code
* (WM and BLO code area, see BLO_LibLinkFlags in BLO_readfile.h). */
typedef enum eFileSel_Params_Flag {
- FILE_SHOWSHORT = (1 << 0),
- FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */
- FILE_LINK = (1 << 2),
- FILE_HIDE_DOT = (1 << 3),
- FILE_AUTOSELECT = (1 << 4),
- FILE_ACTIVE_COLLECTION = (1 << 5),
-/* FILE_ATCURSOR = (1 << 6), */ /* deprecated */
- FILE_DIRSEL_ONLY = (1 << 7),
- FILE_FILTER = (1 << 8),
- FILE_BOOKMARKS = (1 << 9),
- FILE_GROUP_INSTANCE = (1 << 10),
+ FILE_PARAMS_FLAG_DEPRECATED_1 = (1 << 0), /* cleared */
+ FILE_RELPATH = (1 << 1),
+ FILE_LINK = (1 << 2),
+ FILE_HIDE_DOT = (1 << 3),
+ FILE_AUTOSELECT = (1 << 4),
+ FILE_ACTIVE_COLLECTION = (1 << 5),
+ FILE_PARAMS_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
+ FILE_DIRSEL_ONLY = (1 << 7),
+ FILE_FILTER = (1 << 8),
+ FILE_PARAMS_FLAG_DEPRECATED_9 = (1 << 9), /* cleared */
+ FILE_GROUP_INSTANCE = (1 << 10),
} eFileSel_Params_Flag;
-
/* files in filesel list: file types
* Note we could use mere values (instead of bitflags) for file types themselves,
* but since we do not lack of bytes currently...
@@ -975,15 +975,15 @@ typedef enum eSpaceImage_Sticky {
/* SpaceImage.flag */
typedef enum eSpaceImage_Flag {
-/* SI_BE_SQUARE = (1 << 0), */ /* deprecated */
-/* SI_EDITTILE = (1 << 1), */ /* deprecated */
+ SI_FLAG_DEPRECATED_0 = (1 << 0), /* cleared */
+ SI_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
SI_CLIP_UV = (1 << 2),
-/* SI_DRAWTOOL = (1 << 3), */ /* deprecated */
+ SI_FLAG_DEPRECATED_3 = (1 << 3), /* cleared */
SI_NO_DRAWFACES = (1 << 4),
SI_DRAWSHADOW = (1 << 5),
-/* SI_SELACTFACE = (1 << 6), */ /* deprecated */
-/* SI_DEPRECATED2 = (1 << 7), */ /* deprecated */
-/* SI_DEPRECATED3 = (1 << 8), */ /* deprecated */
+ SI_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
+ SI_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */
+ SI_FLAG_DEPRECATED_8 = (1 << 8), /* cleared */
SI_COORDFLOATS = (1 << 9),
SI_PIXELSNAP = (1 << 10),
SI_LIVE_UNWRAP = (1 << 11),
@@ -995,8 +995,8 @@ typedef enum eSpaceImage_Flag {
SI_PREVSPACE = (1 << 15),
SI_FULLWINDOW = (1 << 16),
-/* SI_DEPRECATED4 = (1 << 17), */ /* deprecated */
-/* SI_DEPRECATED5 = (1 << 18), */ /* deprecated */
+ SI_FLAG_DEPRECATED_17 = (1 << 17), /* cleared */
+ SI_FLAG_DEPRECATED_18 = (1 << 18), /* cleared */
/* this means that the image is drawn until it reaches the view edge,
* in the image view, it's unrelated to the 'tile' mode for texface
@@ -1005,9 +1005,9 @@ typedef enum eSpaceImage_Flag {
SI_SMOOTH_UV = (1 << 20),
SI_DRAW_STRETCH = (1 << 21),
SI_SHOW_GPENCIL = (1 << 22),
-/* SI_DEPRECATED6 = (1 << 23), */ /* deprecated */
+ SI_FLAG_DEPRECATED_23 = (1 << 23), /* cleared */
- SI_COLOR_CORRECTION = (1 << 24),
+ SI_FLAG_DEPRECATED_24 = (1 << 24),
SI_NO_DRAW_TEXPAINT = (1 << 25),
SI_DRAW_METADATA = (1 << 26),
@@ -1205,9 +1205,9 @@ typedef enum eSpaceNode_Flag {
SNODE_SHOW_G = (1 << 8),
SNODE_SHOW_B = (1 << 9),
SNODE_AUTO_RENDER = (1 << 5),
-// SNODE_SHOW_HIGHLIGHT = (1 << 6), DNA_DEPRECATED
-// SNODE_USE_HIDDEN_PREVIEW = (1 << 10), DNA_DEPRECATED December2013
-// SNODE_NEW_SHADERS = (1 << 11), DNA_DEPRECATED
+ SNODE_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
+ SNODE_FLAG_DEPRECATED_10 = (1 << 10), /* cleared */
+ SNODE_FLAG_DEPRECATED_11 = (1 << 11), /* cleared */
SNODE_PIN = (1 << 12),
SNODE_SKIP_INSOFFSET = (1 << 13), /* automatically offset following nodes in a chain on insertion */
} eSpaceNode_Flag;