blender
/
blender
135
403
Fork 585
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Cleanup: rename DEPRECATED to UNUSED 

While the flags have been deprecated they're currently unused.
Rename for clarity.
This commit is contained in:
Campbell Barton 2019-03-17 10:28:08 +11:00
parent cf5097d71f
commit cc5bdf0293
Notes: blender-bot 2023-02-14 07:39:44 +01:00 
Referenced by issue #62670, ShaderNodeCustomGroup insert_link is not listening to inserts
Referenced by issue #62666, bpy.context.scene.update() causes erratic object selections
18 changed files with 294 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/versioning_270.c
View File

@ -1709,8 +1709,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
br->falloff_angle = DEG2RADF(80);
br->flag &= ~(
BRUSH_FLAG_DEPRECATED_1 | BRUSH_FLAG_DEPRECATED_6 |
BRUSH_FLAG_DEPRECATED_7 | BRUSH_FLAG_DEPRECATED_17 |
BRUSH_FLAG_UNUSED_1 | BRUSH_FLAG_UNUSED_6 |
BRUSH_FLAG_UNUSED_7 | BRUSH_FLAG_UNUSED_17 |
BRUSH_FRONTFACE_FALLOFF);
}

218
source/blender/blenloader/intern/versioning_280.c
View File

@ -2487,44 +2487,44 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
{
SpaceImage *sima = (SpaceImage *)sl;
sima->flag &= ~(
SI_FLAG_DEPRECATED_0 |
SI_FLAG_DEPRECATED_1 |
SI_FLAG_DEPRECATED_3 |
SI_FLAG_DEPRECATED_6 |
SI_FLAG_DEPRECATED_7 |
SI_FLAG_DEPRECATED_8 |
SI_FLAG_DEPRECATED_17 |
SI_FLAG_DEPRECATED_18 |
SI_FLAG_DEPRECATED_23 |
SI_FLAG_DEPRECATED_24);
SI_FLAG_UNUSED_0 |
SI_FLAG_UNUSED_1 |
SI_FLAG_UNUSED_3 |
SI_FLAG_UNUSED_6 |
SI_FLAG_UNUSED_7 |
SI_FLAG_UNUSED_8 |
SI_FLAG_UNUSED_17 |
SI_FLAG_UNUSED_18 |
SI_FLAG_UNUSED_23 |
SI_FLAG_UNUSED_24);
break;
}
case SPACE_VIEW3D:
{
View3D *v3d = (View3D *)sl;
v3d->flag &= ~(
V3D_FLAG_DEPRECATED_0 |
V3D_FLAG_DEPRECATED_1 |
V3D_FLAG_DEPRECATED_10 |
V3D_FLAG_DEPRECATED_12);
V3D_FLAG_UNUSED_0 |
V3D_FLAG_UNUSED_1 |
V3D_FLAG_UNUSED_10 |
V3D_FLAG_UNUSED_12);
v3d->flag2 &= ~(
V3D_FLAG2_DEPRECATED_3 |
V3D_FLAG2_DEPRECATED_6 |
V3D_FLAG2_DEPRECATED_12 |
V3D_FLAG2_DEPRECATED_13 |
V3D_FLAG2_DEPRECATED_14 |
V3D_FLAG2_DEPRECATED_15);
V3D_FLAG2_UNUSED_3 |
V3D_FLAG2_UNUSED_6 |
V3D_FLAG2_UNUSED_12 |
V3D_FLAG2_UNUSED_13 |
V3D_FLAG2_UNUSED_14 |
V3D_FLAG2_UNUSED_15);
break;
}
case SPACE_OUTLINER:
{
SpaceOutliner *so = (SpaceOutliner *)sl;
so->filter &= ~(
SO_FILTER_DEPRECATED_1 |
SO_FILTER_DEPRECATED_5 |
SO_FILTER_DEPRECATED_12);
SO_FILTER_UNUSED_1 |
SO_FILTER_UNUSED_5 |
SO_FILTER_UNUSED_12);
so->storeflag &= ~(
SO_TREESTORE_DEPRECATED_1);
SO_TREESTORE_UNUSED_1);
break;
}
case SPACE_FILE:
@ -2532,9 +2532,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
SpaceFile *sfile = (SpaceFile *)sl;
if (sfile->params) {
sfile->params->flag &= ~(
FILE_PARAMS_FLAG_DEPRECATED_1 |
FILE_PARAMS_FLAG_DEPRECATED_6 |
FILE_PARAMS_FLAG_DEPRECATED_9);
FILE_PARAMS_FLAG_UNUSED_1 |
FILE_PARAMS_FLAG_UNUSED_6 |
FILE_PARAMS_FLAG_UNUSED_9);
}
break;
}
@ -2542,26 +2542,26 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
{
SpaceNode *snode = (SpaceNode *)sl;
snode->flag &= ~(
SNODE_FLAG_DEPRECATED_6 |
SNODE_FLAG_DEPRECATED_10 |
SNODE_FLAG_DEPRECATED_11);
SNODE_FLAG_UNUSED_6 |
SNODE_FLAG_UNUSED_10 |
SNODE_FLAG_UNUSED_11);
break;
}
case SPACE_PROPERTIES:
{
SpaceProperties *sbuts = (SpaceProperties *)sl;
sbuts->flag &= ~(
SB_FLAG_DEPRECATED_2 |
SB_FLAG_DEPRECATED_3);
SB_FLAG_UNUSED_2 |
SB_FLAG_UNUSED_3);
break;
}
case SPACE_NLA:
{
SpaceNla *snla = (SpaceNla *)sl;
snla->flag &= ~(
SNLA_FLAG_DEPRECATED_0 |
SNLA_FLAG_DEPRECATED_1 |
SNLA_FLAG_DEPRECATED_3);
SNLA_FLAG_UNUSED_0 |
SNLA_FLAG_UNUSED_1 |
SNLA_FLAG_UNUSED_3);
break;
}
}
@ -2571,37 +2571,37 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
scene->r.mode &= ~(
R_MODE_DEPRECATED_1 |
R_MODE_DEPRECATED_2 |
R_MODE_DEPRECATED_3 |
R_MODE_DEPRECATED_4 |
R_MODE_DEPRECATED_5 |
R_MODE_DEPRECATED_6 |
R_MODE_DEPRECATED_7 |
R_MODE_DEPRECATED_8 |
R_MODE_DEPRECATED_10 |
R_MODE_DEPRECATED_13 |
R_MODE_DEPRECATED_16 |
R_MODE_DEPRECATED_17 |
R_MODE_DEPRECATED_18 |
R_MODE_DEPRECATED_19 |
R_MODE_DEPRECATED_20 |
R_MODE_DEPRECATED_21 |
R_MODE_DEPRECATED_27);
R_MODE_UNUSED_1 |
R_MODE_UNUSED_2 |
R_MODE_UNUSED_3 |
R_MODE_UNUSED_4 |
R_MODE_UNUSED_5 |
R_MODE_UNUSED_6 |
R_MODE_UNUSED_7 |
R_MODE_UNUSED_8 |
R_MODE_UNUSED_10 |
R_MODE_UNUSED_13 |
R_MODE_UNUSED_16 |
R_MODE_UNUSED_17 |
R_MODE_UNUSED_18 |
R_MODE_UNUSED_19 |
R_MODE_UNUSED_20 |
R_MODE_UNUSED_21 |
R_MODE_UNUSED_27);
scene->r.scemode &= ~(
R_SCEMODE_DEPRECATED_8 |
R_SCEMODE_DEPRECATED_11 |
R_SCEMODE_DEPRECATED_13 |
R_SCEMODE_DEPRECATED_16 |
R_SCEMODE_DEPRECATED_17 |
R_SCEMODE_DEPRECATED_19);
R_SCEMODE_UNUSED_8 |
R_SCEMODE_UNUSED_11 |
R_SCEMODE_UNUSED_13 |
R_SCEMODE_UNUSED_16 |
R_SCEMODE_UNUSED_17 |
R_SCEMODE_UNUSED_19);
if (scene->toolsettings->sculpt) {
scene->toolsettings->sculpt->flags &= ~(
SCULPT_FLAG_DEPRECATED_0 |
SCULPT_FLAG_DEPRECATED_1 |
SCULPT_FLAG_DEPRECATED_2);
SCULPT_FLAG_UNUSED_0 |
SCULPT_FLAG_UNUSED_1 |
SCULPT_FLAG_UNUSED_2);
}
if (scene->ed) {
@ -2609,14 +2609,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
SEQ_BEGIN (scene->ed, seq)
{
seq->flag &= ~(
SEQ_FLAG_DEPRECATED_6 |
SEQ_FLAG_DEPRECATED_18 |
SEQ_FLAG_DEPRECATED_19 |
SEQ_FLAG_DEPRECATED_21);
SEQ_FLAG_UNUSED_6 |
SEQ_FLAG_UNUSED_18 |
SEQ_FLAG_UNUSED_19 |
SEQ_FLAG_UNUSED_21);
if (seq->type == SEQ_TYPE_SPEED) {
SpeedControlVars *s = (SpeedControlVars *)seq->effectdata;
s->flags &= ~(
SEQ_SPEED_DEPRECATED_1);
SEQ_SPEED_UNUSED_1);
}
} SEQ_END;
}
@ -2624,49 +2624,49 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (World *world = bmain->worlds.first; world; world = world->id.next) {
world->flag &= ~(
WO_MODE_DEPRECATED_1 |
WO_MODE_DEPRECATED_2 |
WO_MODE_DEPRECATED_3 |
WO_MODE_DEPRECATED_4 |
WO_MODE_DEPRECATED_5 |
WO_MODE_DEPRECATED_7);
WO_MODE_UNUSED_1 |
WO_MODE_UNUSED_2 |
WO_MODE_UNUSED_3 |
WO_MODE_UNUSED_4 |
WO_MODE_UNUSED_5 |
WO_MODE_UNUSED_7);
}
for (Image *image = bmain->images.first; image; image = image->id.next) {
image->flag &= ~(
IMA_FLAG_DEPRECATED_0 |
IMA_FLAG_DEPRECATED_1 |
IMA_FLAG_DEPRECATED_4 |
IMA_FLAG_DEPRECATED_6 |
IMA_FLAG_DEPRECATED_8 |
IMA_FLAG_DEPRECATED_15 |
IMA_FLAG_DEPRECATED_16);
IMA_FLAG_UNUSED_0 |
IMA_FLAG_UNUSED_1 |
IMA_FLAG_UNUSED_4 |
IMA_FLAG_UNUSED_6 |
IMA_FLAG_UNUSED_8 |
IMA_FLAG_UNUSED_15 |
IMA_FLAG_UNUSED_16);
}
for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
ob->flag &= ~(
OB_FLAG_DEPRECATED_11 |
OB_FLAG_DEPRECATED_12);
OB_FLAG_UNUSED_11 |
OB_FLAG_UNUSED_12);
ob->transflag &= ~(
OB_TRANSFLAG_DEPRECATED_0 |
OB_TRANSFLAG_DEPRECATED_1);
ob->shapeflag &= ~OB_SHAPE_FLAG_DEPRECATED_1;
OB_TRANSFLAG_UNUSED_0 |
OB_TRANSFLAG_UNUSED_1);
ob->shapeflag &= ~OB_SHAPE_FLAG_UNUSED_1;
}
for (Mesh *me = bmain->meshes.first; me; me = me->id.next) {
me->flag &= ~(
ME_FLAG_DEPRECATED_0 |
ME_FLAG_DEPRECATED_1 |
ME_FLAG_DEPRECATED_3 |
ME_FLAG_DEPRECATED_4 |
ME_FLAG_DEPRECATED_6 |
ME_FLAG_DEPRECATED_7 |
ME_FLAG_DEPRECATED_8);
ME_FLAG_UNUSED_0 |
ME_FLAG_UNUSED_1 |
ME_FLAG_UNUSED_3 |
ME_FLAG_UNUSED_4 |
ME_FLAG_UNUSED_6 |
ME_FLAG_UNUSED_7 |
ME_FLAG_UNUSED_8);
}
for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) {
mat->blend_flag &= ~(
MA_BL_FLAG_DEPRECATED_2);
MA_BL_FLAG_UNUSED_2);
}
}
@ -2779,17 +2779,17 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
R_ALPHAKEY = 2,
};
scene->r.seq_flag &= ~(
R_SEQ_DEPRECATED_0 |
R_SEQ_DEPRECATED_1 |
R_SEQ_DEPRECATED_2);
scene->r.color_mgt_flag &= ~R_COLOR_MANAGEMENT_DEPRECATED_1;
R_SEQ_UNUSED_0 |
R_SEQ_UNUSED_1 |
R_SEQ_UNUSED_2);
scene->r.color_mgt_flag &= ~R_COLOR_MANAGEMENT_UNUSED_1;
if (scene->r.alphamode == R_ALPHAKEY) {
scene->r.alphamode = R_ADDSKY;
}
ToolSettings *ts = scene->toolsettings;
ts->particle.flag &= ~PE_DEPRECATED_6;
ts->particle.flag &= ~PE_UNUSED_6;
if (ts->sculpt != NULL) {
ts->sculpt->flags &= ~SCULPT_FLAG_DEPRECATED_6;
ts->sculpt->flags &= ~SCULPT_FLAG_UNUSED_6;
}
}
}
@ -2857,25 +2857,25 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
ob->transflag &= ~(
OB_TRANSFLAG_DEPRECATED_0 |
OB_TRANSFLAG_DEPRECATED_1 |
OB_TRANSFLAG_DEPRECATED_3 |
OB_TRANSFLAG_DEPRECATED_6 |
OB_TRANSFLAG_DEPRECATED_12);
OB_TRANSFLAG_UNUSED_0 |
OB_TRANSFLAG_UNUSED_1 |
OB_TRANSFLAG_UNUSED_3 |
OB_TRANSFLAG_UNUSED_6 |
OB_TRANSFLAG_UNUSED_12);
ob->nlaflag &= ~(OB_ADS_DEPRECATED_1 | OB_ADS_DEPRECATED_2);
ob->nlaflag &= ~(OB_ADS_UNUSED_1 | OB_ADS_UNUSED_2);
}
LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
arm->flag &= ~(
ARM_FLAG_DEPRECATED_1 |
ARM_FLAG_DEPRECATED_5 |
ARM_FLAG_DEPRECATED_7 |
ARM_FLAG_DEPRECATED_12);
ARM_FLAG_UNUSED_1 |
ARM_FLAG_UNUSED_5 |
ARM_FLAG_UNUSED_7 |
ARM_FLAG_UNUSED_12);
}
LISTBASE_FOREACH (Text *, text, &bmain->texts) {
text->flags &= ~(TXT_FLAG_DEPRECATED_8 | TXT_FLAG_DEPRECATED_9);
text->flags &= ~(TXT_FLAG_UNUSED_8 | TXT_FLAG_UNUSED_9);
}
}

22
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -356,14 +356,14 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
if (!USER_VERSION_ATLEAST(278, 6)) {
/* Clear preference flags for re-use. */
userdef->flag &= ~(
USER_FLAG_NUMINPUT_ADVANCED | USER_FLAG_DEPRECATED_2 | USER_FLAG_DEPRECATED_3 |
USER_FLAG_DEPRECATED_6 | USER_FLAG_DEPRECATED_7 |
USER_FLAG_DEPRECATED_9 | USER_DEVELOPER_UI);
USER_FLAG_NUMINPUT_ADVANCED | USER_FLAG_UNUSED_2 | USER_FLAG_UNUSED_3 |
USER_FLAG_UNUSED_6 | USER_FLAG_UNUSED_7 |
USER_FLAG_UNUSED_9 | USER_DEVELOPER_UI);
userdef->uiflag &= ~(
USER_HEADER_BOTTOM);
userdef->transopts &= ~(
USER_TR_DEPRECATED_2 | USER_TR_DEPRECATED_3 | USER_TR_DEPRECATED_4 |
USER_TR_DEPRECATED_6 | USER_TR_DEPRECATED_7);
USER_TR_UNUSED_2 | USER_TR_UNUSED_3 | USER_TR_UNUSED_4 |
USER_TR_UNUSED_6 | USER_TR_UNUSED_7);
userdef->uiflag |= USER_LOCK_CURSOR_ADJUST;
}
@ -451,12 +451,12 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
copy_v4_fl4(userdef->light_ambient, 0.025000, 0.025000, 0.025000, 1.000000);
userdef->flag &= ~(
USER_FLAG_DEPRECATED_4);
USER_FLAG_UNUSED_4);
userdef->uiflag &= ~(
USER_HEADER_FROM_PREF |
USER_UIFLAG_DEPRECATED_12 |
USER_UIFLAG_DEPRECATED_22);
USER_UIFLAG_UNUSED_12 |
USER_UIFLAG_UNUSED_22);
}
if (!USER_VERSION_ATLEAST(280, 41)) {
@ -469,11 +469,11 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
if (!USER_VERSION_ATLEAST(280, 44)) {
userdef->uiflag &= ~(
USER_UIFLAG_DEPRECATED_0 | USER_UIFLAG_DEPRECATED_1);
USER_UIFLAG_UNUSED_0 | USER_UIFLAG_UNUSED_1);
userdef->uiflag2 &= ~(
USER_UIFLAG2_DEPRECATED_0);
USER_UIFLAG2_UNUSED_0);
userdef->gp_settings &= ~(
GP_PAINT_DEPRECATED_0);
GP_PAINT_UNUSED_0);
}
/**

2
source/blender/makesdna/DNA_anim_types.h
View File

@ -528,7 +528,7 @@ typedef enum eDriver_Flags {
DRIVER_FLAG_RECOMPILE = (1 << 3),
/** The names are cached so they don't need have python unicode versions created each time */
DRIVER_FLAG_RENAMEVAR = (1 << 4),
// DRIVER_FLAG_DEPRECATED_5 = (1 << 5),
// DRIVER_FLAG_UNUSED_5 = (1 << 5),
/** Include 'self' in the drivers namespace. */
DRIVER_FLAG_USE_SELF = (1 << 6),
} eDriver_Flags;

8
source/blender/makesdna/DNA_armature_types.h
View File

@ -137,13 +137,13 @@ typedef struct bArmature {
typedef enum eArmature_Flag {
ARM_RESTPOS = (1<<0),
/** XRAY is here only for backwards converting */
ARM_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
ARM_FLAG_UNUSED_1 = (1 << 1), /* cleared */
ARM_DRAWAXES = (1<<2),
ARM_DRAWNAMES = (1<<3),
ARM_POSEMODE = (1<<4),
ARM_FLAG_DEPRECATED_5 = (1<<5), /* cleared */
ARM_FLAG_UNUSED_5 = (1<<5), /* cleared */
ARM_DELAYDEFORM = (1<<6),
ARM_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */
ARM_FLAG_UNUSED_7 = (1 << 7), /* cleared */
ARM_MIRROR_EDIT = (1<<8),
ARM_AUTO_IK = (1<<9),
/** made option negative, for backwards compat */
@ -151,7 +151,7 @@ typedef enum eArmature_Flag {
/** draw custom colors */
ARM_COL_CUSTOM = (1<<11),
/** when ghosting, only show selected bones (this should belong to ghostflag instead) */
ARM_FLAG_DEPRECATED_12 = (1 << 12), /* cleared */
ARM_FLAG_UNUSED_12 = (1 << 12), /* cleared */
/** dopesheet channel is expanded */
ARM_DS_EXPAND = (1<<13),
/** other objects are used for visualizing various states (hack for efficient updates) */

8
source/blender/makesdna/DNA_brush_types.h
View File

@ -356,13 +356,13 @@ typedef enum eBrushGradientSourceFill {
/* Brush.flag */
typedef enum eBrushFlags {
BRUSH_AIRBRUSH = (1 << 0),
BRUSH_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
BRUSH_FLAG_UNUSED_1 = (1 << 1), /* cleared */
BRUSH_ALPHA_PRESSURE = (1 << 2),
BRUSH_SIZE_PRESSURE = (1 << 3),
BRUSH_JITTER_PRESSURE = (1 << 4),
BRUSH_SPACING_PRESSURE = (1 << 5),
BRUSH_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
BRUSH_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */
BRUSH_FLAG_UNUSED_6 = (1 << 6), /* cleared */
BRUSH_FLAG_UNUSED_7 = (1 << 7), /* cleared */
BRUSH_ANCHORED = (1 << 8),
BRUSH_DIR_IN = (1 << 9),
BRUSH_SPACE = (1 << 10),
@ -372,7 +372,7 @@ typedef enum eBrushFlags {
BRUSH_LOCK_ALPHA = (1 << 14),
BRUSH_ORIGINAL_NORMAL = (1 << 15),
BRUSH_OFFSET_PRESSURE = (1 << 16),
BRUSH_FLAG_DEPRECATED_17 = (1 << 17), /* cleared */
BRUSH_FLAG_UNUSED_17 = (1 << 17), /* cleared */
BRUSH_SPACE_ATTEN = (1 << 18),
BRUSH_ADAPTIVE_SPACE = (1 << 19),
BRUSH_LOCK_SIZE = (1 << 20),

18
source/blender/makesdna/DNA_image_types.h
View File

@ -90,8 +90,8 @@ typedef struct RenderSlot {
/* iuser->flag */
#define IMA_ANIM_ALWAYS (1 << 0)
/* #define IMA_DEPRECATED_1 (1 << 1) */
/* #define IMA_DEPRECATED_2 (1 << 2) */
/* #define IMA_UNUSED_1 (1 << 1) */
/* #define IMA_UNUSED_2 (1 << 2) */
#define IMA_NEED_FRAME_RECALC (1 << 3)
#define IMA_SHOW_STEREO (1 << 4)
@ -165,16 +165,16 @@ typedef struct Image {
/* Image.flag */
enum {
IMA_FLAG_DEPRECATED_0 = (1 << 0), /* cleared */
IMA_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
IMA_FLAG_UNUSED_0 = (1 << 0), /* cleared */
IMA_FLAG_UNUSED_1 = (1 << 1), /* cleared */
#ifdef DNA_DEPRECATED
IMA_DO_PREMUL = (1 << 2),
#endif
IMA_FLAG_DEPRECATED_4 = (1 << 4), /* cleared */
IMA_FLAG_UNUSED_4 = (1 << 4), /* cleared */
IMA_NOCOLLECT = (1 << 5),
IMA_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
IMA_FLAG_UNUSED_6 = (1 << 6), /* cleared */
IMA_OLD_PREMUL = (1 << 7),
IMA_FLAG_DEPRECATED_8 = (1 << 8), /* cleared */
IMA_FLAG_UNUSED_8 = (1 << 8), /* cleared */
IMA_USED_FOR_RENDER = (1 << 9),
/** For image user, but these flags are mixed. */
IMA_USER_FRAME_IN_RANGE = (1 << 10),
@ -182,8 +182,8 @@ enum {
IMA_IGNORE_ALPHA = (1 << 12),
IMA_DEINTERLACE = (1 << 13),
IMA_USE_VIEWS = (1 << 14),
IMA_FLAG_DEPRECATED_15 = (1 << 15), /* cleared */
IMA_FLAG_DEPRECATED_16 = (1 << 16), /* cleared */
IMA_FLAG_UNUSED_15 = (1 << 15), /* cleared */
IMA_FLAG_UNUSED_16 = (1 << 16), /* cleared */
};
/* Image.gpuflag */

2
source/blender/makesdna/DNA_material_types.h
View File

@ -301,7 +301,7 @@ enum {
enum {
MA_BL_HIDE_BACKFACE = (1 << 0),
MA_BL_SS_REFRACTION = (1 << 1),
MA_BL_FLAG_DEPRECATED_2 = (1 << 2), /* cleared */
MA_BL_FLAG_UNUSED_2 = (1 << 2), /* cleared */
MA_BL_TRANSLUCENCY = (1 << 3),
};

14
source/blender/makesdna/DNA_mesh_types.h
View File

@ -233,15 +233,15 @@ enum {
/* me->flag */
enum {
ME_FLAG_DEPRECATED_0 = 1 << 0, /* cleared */
ME_FLAG_DEPRECATED_1 = 1 << 1, /* cleared */
ME_FLAG_UNUSED_0 = 1 << 0, /* cleared */
ME_FLAG_UNUSED_1 = 1 << 1, /* cleared */
ME_TWOSIDED = 1 << 2,
ME_FLAG_DEPRECATED_3 = 1 << 3, /* cleared */
ME_FLAG_DEPRECATED_4 = 1 << 4, /* cleared */
ME_FLAG_UNUSED_3 = 1 << 3, /* cleared */
ME_FLAG_UNUSED_4 = 1 << 4, /* cleared */
ME_AUTOSMOOTH = 1 << 5,
ME_FLAG_DEPRECATED_6 = 1 << 6, /* cleared */
ME_FLAG_DEPRECATED_7 = 1 << 7, /* cleared */
ME_FLAG_DEPRECATED_8 = 1 << 8, /* cleared */
ME_FLAG_UNUSED_6 = 1 << 6, /* cleared */
ME_FLAG_UNUSED_7 = 1 << 7, /* cleared */
ME_FLAG_UNUSED_8 = 1 << 8, /* cleared */
ME_DS_EXPAND = 1 << 9,
ME_SCULPT_DYNAMIC_TOPOLOGY = 1 << 10,
};

20
source/blender/makesdna/DNA_object_types.h
View File

@ -475,20 +475,20 @@ enum {
/* (short) transflag */
enum {
OB_TRANSFLAG_DEPRECATED_0 = 1 << 0, /* cleared */
OB_TRANSFLAG_DEPRECATED_1 = 1 << 1, /* cleared */
OB_TRANSFLAG_UNUSED_0 = 1 << 0, /* cleared */
OB_TRANSFLAG_UNUSED_1 = 1 << 1, /* cleared */
OB_NEG_SCALE = 1 << 2,
OB_TRANSFLAG_DEPRECATED_3 = 1 << 3, /* cleared */
OB_TRANSFLAG_UNUSED_3 = 1 << 3, /* cleared */
OB_DUPLIVERTS = 1 << 4,
OB_DUPLIROT = 1 << 5,
OB_TRANSFLAG_DEPRECATED_6 = 1 << 6, /* cleared */
OB_TRANSFLAG_UNUSED_6 = 1 << 6, /* cleared */
/* runtime, calculate derivedmesh for dupli before it's used */
OB_DUPLICALCDERIVED = 1 << 7,
OB_DUPLICOLLECTION = 1 << 8,
OB_DUPLIFACES = 1 << 9,
OB_DUPLIFACES_SCALE = 1 << 10,
OB_DUPLIPARTS = 1 << 11,
OB_TRANSFLAG_DEPRECATED_12 = 1 << 12, /* cleared */
OB_TRANSFLAG_UNUSED_12 = 1 << 12, /* cleared */
/* runtime constraints disable */
OB_NO_CONSTRAINTS = 1 << 13,
/* hack to work around particle issue */
@ -597,8 +597,8 @@ enum {
#define OB_FROMDUPLI (1 << 9)
#define OB_DONE (1 << 10) /* unknown state, clear before use */
#ifdef DNA_DEPRECATED_ALLOW
# define OB_FLAG_DEPRECATED_11 (1 << 11) /* cleared */
# define OB_FLAG_DEPRECATED_12 (1 << 12) /* cleared */
# define OB_FLAG_UNUSED_11 (1 << 11) /* cleared */
# define OB_FLAG_UNUSED_12 (1 << 12) /* cleared */
#endif
/* ob->restrictflag */
@ -612,15 +612,15 @@ enum {
enum {
OB_SHAPE_LOCK = 1 << 0,
#ifdef DNA_DEPRECATED_ALLOW
OB_SHAPE_FLAG_DEPRECATED_1 = 1 << 1, /* cleared */
OB_SHAPE_FLAG_UNUSED_1 = 1 << 1, /* cleared */
#endif
OB_SHAPE_EDIT_MODE = 1 << 2,
};
/* ob->nlaflag */
enum {
OB_ADS_DEPRECATED_1 = 1 << 0, /* cleared */
OB_ADS_DEPRECATED_2 = 1 << 1, /* cleared */
OB_ADS_UNUSED_1 = 1 << 0, /* cleared */
OB_ADS_UNUSED_2 = 1 << 1, /* cleared */
/* object-channel expanded status */
OB_ADS_COLLAPSED = 1 << 10,
/* object's ipo-block */

76
source/blender/makesdna/DNA_scene_types.h
View File

@ -255,18 +255,18 @@ typedef struct SceneRenderLayer {
typedef enum eScenePassType {
SCE_PASS_COMBINED = (1 << 0),
SCE_PASS_Z = (1 << 1),
SCE_PASS_DEPRECATED_1 = (1 << 2), /* RGBA */
SCE_PASS_DEPRECATED_2 = (1 << 3), /* DIFFUSE */
SCE_PASS_DEPRECATED_3 = (1 << 4), /* SPEC */
SCE_PASS_UNUSED_1 = (1 << 2), /* RGBA */
SCE_PASS_UNUSED_2 = (1 << 3), /* DIFFUSE */
SCE_PASS_UNUSED_3 = (1 << 4), /* SPEC */
SCE_PASS_SHADOW = (1 << 5),
SCE_PASS_AO = (1 << 6),
SCE_PASS_DEPRECATED_4 = (1 << 7), /* REFLECT */
SCE_PASS_UNUSED_4 = (1 << 7), /* REFLECT */
SCE_PASS_NORMAL = (1 << 8),
SCE_PASS_VECTOR = (1 << 9),
SCE_PASS_DEPRECATED_5 = (1 << 10), /* REFRACT */
SCE_PASS_UNUSED_5 = (1 << 10), /* REFRACT */
SCE_PASS_INDEXOB = (1 << 11),
SCE_PASS_UV = (1 << 12),
SCE_PASS_DEPRECATED_6 = (1 << 13), /* INDIRECT */
SCE_PASS_UNUSED_6 = (1 << 13), /* INDIRECT */
SCE_PASS_MIST = (1 << 14),
SCE_PASS_RAYHITS = (1 << 15),
SCE_PASS_EMIT = (1 << 16),
@ -1791,42 +1791,42 @@ typedef struct Scene {
/* RenderData.mode */
#define R_OSA (1 << 0)
#define R_MODE_DEPRECATED_1 (1 << 1) /* cleared */
#define R_MODE_DEPRECATED_2 (1 << 2) /* cleared */
#define R_MODE_DEPRECATED_3 (1 << 3) /* cleared */
#define R_MODE_DEPRECATED_4 (1 << 4) /* cleared */
#define R_MODE_DEPRECATED_5 (1 << 5) /* cleared */
#define R_MODE_DEPRECATED_6 (1 << 6) /* cleared */
#define R_MODE_DEPRECATED_7 (1 << 7) /* cleared */
#define R_MODE_DEPRECATED_8 (1 << 8) /* cleared */
#define R_MODE_UNUSED_1 (1 << 1) /* cleared */
#define R_MODE_UNUSED_2 (1 << 2) /* cleared */
#define R_MODE_UNUSED_3 (1 << 3) /* cleared */
#define R_MODE_UNUSED_4 (1 << 4) /* cleared */
#define R_MODE_UNUSED_5 (1 << 5) /* cleared */
#define R_MODE_UNUSED_6 (1 << 6) /* cleared */
#define R_MODE_UNUSED_7 (1 << 7) /* cleared */
#define R_MODE_UNUSED_8 (1 << 8) /* cleared */
#define R_BORDER (1 << 9)
#define R_MODE_DEPRECATED_10 (1 << 10) /* cleared */
#define R_MODE_UNUSED_10 (1 << 10) /* cleared */
#define R_CROP (1 << 11)
/* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
#define R_NO_CAMERA_SWITCH (1 << 12)
#define R_MODE_DEPRECATED_13 (1 << 13) /* cleared */
#define R_MODE_UNUSED_13 (1 << 13) /* cleared */
#define R_MBLUR (1 << 14)
/* unified was here */
#define R_MODE_DEPRECATED_16 (1 << 16) /* cleared */
#define R_MODE_DEPRECATED_17 (1 << 17) /* cleared */
#define R_MODE_DEPRECATED_18 (1 << 18) /* cleared */
#define R_MODE_DEPRECATED_19 (1 << 19) /* cleared */
#define R_MODE_UNUSED_16 (1 << 16) /* cleared */
#define R_MODE_UNUSED_17 (1 << 17) /* cleared */
#define R_MODE_UNUSED_18 (1 << 18) /* cleared */
#define R_MODE_UNUSED_19 (1 << 19) /* cleared */
#define R_FIXED_THREADS (1 << 19)
#define R_MODE_DEPRECATED_20 (1 << 20) /* cleared */
#define R_MODE_DEPRECATED_21 (1 << 21) /* cleared */
#define R_MODE_UNUSED_20 (1 << 20) /* cleared */
#define R_MODE_UNUSED_21 (1 << 21) /* cleared */
#define R_NO_OVERWRITE (1 << 22) /* skip existing files */
#define R_TOUCH (1 << 23) /* touch files before rendering */
#define R_SIMPLIFY (1 << 24)
#define R_EDGE_FRS (1 << 25) /* R_EDGE reserved for Freestyle */
#define R_PERSISTENT_DATA (1 << 26) /* keep data around for re-render */
#define R_MODE_DEPRECATED_27 (1 << 27) /* cleared */
#define R_MODE_UNUSED_27 (1 << 27) /* cleared */
/* RenderData.seq_flag */
enum {
R_SEQ_DEPRECATED_0 = (1 << 0), /* cleared */
R_SEQ_DEPRECATED_1 = (1 << 1), /* cleared */
R_SEQ_DEPRECATED_2 = (1 << 2), /* cleared */
R_SEQ_UNUSED_0 = (1 << 0), /* cleared */
R_SEQ_UNUSED_1 = (1 << 1), /* cleared */
R_SEQ_UNUSED_2 = (1 << 2), /* cleared */
R_SEQ_SOLID_TEX = (1 << 3),
R_SEQ_CAMERA_DOF = (1 << 4),
};
@ -1858,18 +1858,18 @@ enum {
#define R_MATNODE_PREVIEW (1 << 5)
#define R_DOCOMP (1 << 6)
#define R_COMP_CROP (1 << 7)
#define R_SCEMODE_DEPRECATED_8 (1 << 8) /* cleared */
#define R_SCEMODE_UNUSED_8 (1 << 8) /* cleared */
#define R_SINGLE_LAYER (1 << 9)
#define R_EXR_TILE_FILE (1 << 10)
#define R_SCEMODE_DEPRECATED_11 (1 << 11) /* cleared */
#define R_SCEMODE_UNUSED_11 (1 << 11) /* cleared */
#define R_NO_IMAGE_LOAD (1 << 12)
#define R_SCEMODE_DEPRECATED_13 (1 << 13) /* cleared */
#define R_SCEMODE_UNUSED_13 (1 << 13) /* cleared */
#define R_NO_FRAME_UPDATE (1 << 14)
#define R_FULL_SAMPLE (1 << 15)
#define R_SCEMODE_DEPRECATED_16 (1 << 16) /* cleared */
#define R_SCEMODE_DEPRECATED_17 (1 << 17) /* cleared */
#define R_SCEMODE_UNUSED_16 (1 << 16) /* cleared */
#define R_SCEMODE_UNUSED_17 (1 << 17) /* cleared */
#define R_TEXNODE_PREVIEW (1 << 18)
#define R_SCEMODE_DEPRECATED_19 (1 << 19) /* cleared */
#define R_SCEMODE_UNUSED_19 (1 << 19) /* cleared */
#define R_EXR_CACHE_FILE (1 << 20)
#define R_MULTIVIEW (1 << 21)
@ -1904,7 +1904,7 @@ enum {
enum {
/** deprecated, should only be used in versioning code only */
R_COLOR_MANAGEMENT = (1 << 0),
R_COLOR_MANAGEMENT_DEPRECATED_1 = (1 << 1),
R_COLOR_MANAGEMENT_UNUSED_1 = (1 << 1),
};
#ifdef DNA_DEPRECATED
@ -2180,15 +2180,15 @@ typedef enum ePaintSymmetryFlags {
/* Sculpt.flags */
/* These can eventually be moved to paint flags? */
typedef enum eSculptFlags {
SCULPT_FLAG_DEPRECATED_0 = (1 << 0), /* cleared */
SCULPT_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
SCULPT_FLAG_DEPRECATED_2 = (1 << 2), /* cleared */
SCULPT_FLAG_UNUSED_0 = (1 << 0), /* cleared */
SCULPT_FLAG_UNUSED_1 = (1 << 1), /* cleared */
SCULPT_FLAG_UNUSED_2 = (1 << 2), /* cleared */
SCULPT_LOCK_X = (1 << 3),
SCULPT_LOCK_Y = (1 << 4),
SCULPT_LOCK_Z = (1 << 5),
SCULPT_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
SCULPT_FLAG_UNUSED_6 = (1 << 6), /* cleared */
SCULPT_USE_OPENMP = (1 << 7),
SCULPT_ONLY_DEFORM = (1 << 8),
@ -2354,7 +2354,7 @@ typedef enum eGPencil_Guide_Reference {
#define PE_DEFLECT_EMITTER (1 << 2)
#define PE_INTERPOLATE_ADDED (1 << 3)
#define PE_DRAW_PART (1 << 4)
#define PE_DEPRECATED_6 (1 << 6) /* cleared */
#define PE_UNUSED_6 (1 << 6) /* cleared */
#define PE_FADE_TIME (1 << 7)
#define PE_AUTO_VELOCITY (1 << 8)

6
source/blender/makesdna/DNA_screen_types.h
View File

@ -450,15 +450,15 @@ typedef struct ARegion {
/** #ScrArea.flag */
enum {
HEADER_NO_PULLDOWN = (1 << 0),
// AREA_FLAG_DEPRECATED_1 = (1 << 1),
// AREA_FLAG_DEPRECATED_2 = (1 << 2),
// AREA_FLAG_UNUSED_1 = (1 << 1),
// AREA_FLAG_UNUSED_2 = (1 << 2),
#ifdef DNA_DEPRECATED_ALLOW
AREA_TEMP_INFO = (1 << 3), /* versioned to make slot reusable */
#endif
/* update size of regions within the area */
AREA_FLAG_REGION_SIZE_UPDATE = (1 << 3),
AREA_FLAG_ACTIVE_TOOL_UPDATE = (1 << 4),
// AREA_FLAG_DEPRECATED_5 = (1 << 5),
// AREA_FLAG_UNUSED_5 = (1 << 5),
/* used to check if we should switch back to prevspace (of a different type) */
AREA_FLAG_TEMP_TYPE = (1 << 6),
/* for temporary fullscreens (file browser, image editor render)

10
source/blender/makesdna/DNA_sequence_types.h
View File

@ -446,7 +446,7 @@ typedef struct SequencerScopes {
/* SpeedControlVars->flags */
#define SEQ_SPEED_INTEGRATE (1 << 0)
#define SEQ_SPEED_DEPRECATED_1 (1 << 1) /* cleared */
#define SEQ_SPEED_UNUSED_1 (1 << 1) /* cleared */
#define SEQ_SPEED_COMPRESS_IPO_Y (1 << 2)
/* ***************** SEQUENCE ****************** */
@ -460,7 +460,7 @@ enum {
SEQ_OVERLAP = (1 << 3),
SEQ_FILTERY = (1 << 4),
SEQ_MUTE = (1 << 5),
SEQ_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
SEQ_FLAG_UNUSED_6 = (1 << 6), /* cleared */
SEQ_REVERSE_FRAMES = (1 << 7),
SEQ_IPO_FRAME_LOCKED = (1 << 8),
SEQ_EFFECT_NOT_LOADED = (1 << 9),
@ -472,9 +472,9 @@ enum {
SEQ_USE_PROXY = (1 << 15),
SEQ_USE_TRANSFORM = (1 << 16),
SEQ_USE_CROP = (1 << 17),
SEQ_FLAG_DEPRECATED_18 = (1 << 18), /* cleared */
SEQ_FLAG_DEPRECATED_19 = (1 << 19), /* cleared */
SEQ_FLAG_DEPRECATED_21 = (1 << 21), /* cleared */
SEQ_FLAG_UNUSED_18 = (1 << 18), /* cleared */
SEQ_FLAG_UNUSED_19 = (1 << 19), /* cleared */
SEQ_FLAG_UNUSED_21 = (1 << 21), /* cleared */
SEQ_USE_EFFECT_DEFAULT_FADE = (1 << 22),
SEQ_USE_LINEAR_MODIFIERS = (1 << 23),

54
source/blender/makesdna/DNA_space_types.h
View File

@ -205,8 +205,8 @@ typedef enum eSpaceButtons_Context {
typedef enum eSpaceButtons_Flag {
SB_PRV_OSA = (1 << 0),
SB_PIN_CONTEXT = (1 << 1),
SB_FLAG_DEPRECATED_2 = (1 << 2),
SB_FLAG_DEPRECATED_3 = (1 << 3),
SB_FLAG_UNUSED_2 = (1 << 2),
SB_FLAG_UNUSED_3 = (1 << 3),
/** Do not add materials, particles, etc. in TemplateTextureUser list. */
SB_TEX_USER_LIMITED = (1 << 3),
SB_SHADING_CONTEXT = (1 << 4),
@ -270,12 +270,12 @@ typedef enum eSpaceOutliner_Flag {
/* SpaceOutliner.filter */
typedef enum eSpaceOutliner_Filter {
SO_FILTER_SEARCH = (1 << 0), /* Run-time flag. */
SO_FILTER_DEPRECATED_1 = (1 << 1), /* cleared */
SO_FILTER_UNUSED_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_DEPRECATED_5 = (1 << 5), /* cleared */
SO_FILTER_UNUSED_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),
@ -283,7 +283,7 @@ typedef enum eSpaceOutliner_Filter {
SO_FILTER_NO_OB_CAMERA = (1 << 10),
SO_FILTER_NO_OB_OTHERS = (1 << 11),
SO_FILTER_DEPRECATED_12 = (1 << 12), /* cleared */
SO_FILTER_UNUSED_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. */
@ -341,7 +341,7 @@ typedef enum eSpaceOutliner_Mode {
typedef enum eSpaceOutliner_StoreFlag {
/* cleanup tree */
SO_TREESTORE_CLEANUP = (1 << 0),
SO_TREESTORE_DEPRECATED_1 = (1 << 1), /* cleared */
SO_TREESTORE_UNUSED_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),
@ -487,11 +487,11 @@ typedef struct SpaceNla {
/* SpaceNla.flag */
typedef enum eSpaceNla_Flag {
SNLA_FLAG_DEPRECATED_0 = (1 << 0),
SNLA_FLAG_DEPRECATED_1 = (1 << 1),
SNLA_FLAG_UNUSED_0 = (1 << 0),
SNLA_FLAG_UNUSED_1 = (1 << 1),
/* draw timing in seconds instead of frames */
SNLA_DRAWTIME = (1 << 2),
SNLA_FLAG_DEPRECATED_3 = (1 << 3),
SNLA_FLAG_UNUSED_3 = (1 << 3),
/* don't draw frame number beside frame indicator */
SNLA_NODRAWCFRANUM = (1 << 4),
/* don't draw influence curves on strips */
@ -767,16 +767,16 @@ typedef enum eFileSel_Action {
/* 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_PARAMS_FLAG_DEPRECATED_1 = (1 << 0), /* cleared */
FILE_PARAMS_FLAG_UNUSED_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_PARAMS_FLAG_UNUSED_6 = (1 << 6), /* cleared */
FILE_DIRSEL_ONLY = (1 << 7),
FILE_FILTER = (1 << 8),
FILE_PARAMS_FLAG_DEPRECATED_9 = (1 << 9), /* cleared */
FILE_PARAMS_FLAG_UNUSED_9 = (1 << 9), /* cleared */
FILE_GROUP_INSTANCE = (1 << 10),
} eFileSel_Params_Flag;
@ -1062,17 +1062,17 @@ typedef enum eSpaceImage_Sticky {
/* SpaceImage.flag */
typedef enum eSpaceImage_Flag {
SI_FLAG_DEPRECATED_0 = (1 << 0), /* cleared */
SI_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */
SI_FLAG_UNUSED_0 = (1 << 0), /* cleared */
SI_FLAG_UNUSED_1 = (1 << 1), /* cleared */
SI_CLIP_UV = (1 << 2),
SI_FLAG_DEPRECATED_3 = (1 << 3), /* cleared */
SI_FLAG_UNUSED_3 = (1 << 3), /* cleared */
SI_NO_DRAWFACES = (1 << 4),
SI_DRAWSHADOW = (1 << 5),
SI_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
SI_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */
SI_FLAG_DEPRECATED_8 = (1 << 8), /* cleared */
SI_FLAG_UNUSED_6 = (1 << 6), /* cleared */
SI_FLAG_UNUSED_7 = (1 << 7), /* cleared */
SI_FLAG_UNUSED_8 = (1 << 8), /* cleared */
SI_COORDFLOATS = (1 << 9),
SI_FLAG_DEPRECATED_10 = (1 << 10),
SI_FLAG_UNUSED_10 = (1 << 10),
SI_LIVE_UNWRAP = (1 << 11),
SI_USE_ALPHA = (1 << 12),
SI_SHOW_ALPHA = (1 << 13),
@ -1082,8 +1082,8 @@ typedef enum eSpaceImage_Flag {
SI_PREVSPACE = (1 << 15),
SI_FULLWINDOW = (1 << 16),
SI_FLAG_DEPRECATED_17 = (1 << 17), /* cleared */
SI_FLAG_DEPRECATED_18 = (1 << 18), /* cleared */
SI_FLAG_UNUSED_17 = (1 << 17), /* cleared */
SI_FLAG_UNUSED_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
@ -1092,9 +1092,9 @@ typedef enum eSpaceImage_Flag {
SI_SMOOTH_UV = (1 << 20),
SI_DRAW_STRETCH = (1 << 21),
SI_SHOW_GPENCIL = (1 << 22),
SI_FLAG_DEPRECATED_23 = (1 << 23), /* cleared */
SI_FLAG_UNUSED_23 = (1 << 23), /* cleared */
SI_FLAG_DEPRECATED_24 = (1 << 24),
SI_FLAG_UNUSED_24 = (1 << 24),
SI_NO_DRAW_TEXPAINT = (1 << 25),
SI_DRAW_METADATA = (1 << 26),
@ -1103,7 +1103,7 @@ typedef enum eSpaceImage_Flag {
SI_SHOW_G = (1 << 28),
SI_SHOW_B = (1 << 29),
SI_NO_DRAWEDGES = (1 << 30),
SI_NO_DRAWEDGES = (1 << 30),
} eSpaceImage_Flag;
/* SpaceImage.other_uv_filter */
@ -1332,9 +1332,9 @@ typedef enum eSpaceNode_Flag {
SNODE_SHOW_G = (1 << 8),
SNODE_SHOW_B = (1 << 9),
SNODE_AUTO_RENDER = (1 << 5),
SNODE_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
SNODE_FLAG_DEPRECATED_10 = (1 << 10), /* cleared */
SNODE_FLAG_DEPRECATED_11 = (1 << 11), /* cleared */
SNODE_FLAG_UNUSED_6 = (1 << 6), /* cleared */
SNODE_FLAG_UNUSED_10 = (1 << 10), /* cleared */
SNODE_FLAG_UNUSED_11 = (1 << 11), /* cleared */
SNODE_PIN = (1 << 12),
/** automatically offset following nodes in a chain on insertion */
SNODE_SKIP_INSOFFSET = (1 << 13),

4
source/blender/makesdna/DNA_text_types.h
View File

@ -66,8 +66,8 @@ enum {
/** Used by space handler scriptlinks. */
TXT_ISSCRIPT = 1 << 4,
TXT_FLAG_DEPRECATED_8 = 1 << 8, /* cleared */
TXT_FLAG_DEPRECATED_9 = 1 << 9, /* cleared */
TXT_FLAG_UNUSED_8 = 1 << 8, /* cleared */
TXT_FLAG_UNUSED_9 = 1 << 9, /* cleared */
/** Use space instead of tabs. */
TXT_TABSTOSPACES = 1 << 10,

88
source/blender/makesdna/DNA_userdef_types.h
View File

@ -801,32 +801,32 @@ typedef enum eUserPref_SectionFlag {
/** #UserDef.flag */
typedef enum eUserPref_Flag {
USER_AUTOSAVE = (1 << 0),
USER_AUTOSAVE = (1 << 0),
USER_FLAG_NUMINPUT_ADVANCED = (1 << 1),
USER_FLAG_DEPRECATED_2 = (1 << 2), /* cleared */
USER_FLAG_DEPRECATED_3 = (1 << 3), /* cleared */
USER_FLAG_DEPRECATED_4 = (1 << 4), /* cleared */
USER_TRACKBALL = (1 << 5),
USER_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */
USER_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */
USER_MAT_ON_OB = (1 << 8),
USER_FLAG_DEPRECATED_9 = (1 << 9), /* cleared */
USER_DEVELOPER_UI = (1 << 10),
USER_TOOLTIPS = (1 << 11),
USER_TWOBUTTONMOUSE = (1 << 12),
USER_NONUMPAD = (1 << 13),
USER_FLAG_DEPRECATED_14 = (1 << 14), /* cleared */
USER_FILECOMPRESS = (1 << 15),
USER_SAVE_PREVIEWS = (1 << 16),
USER_CUSTOM_RANGE = (1 << 17),
USER_ADD_EDITMODE = (1 << 18),
USER_ADD_VIEWALIGNED = (1 << 19),
USER_RELPATHS = (1 << 20),
USER_RELEASECONFIRM = (1 << 21),
USER_SCRIPT_AUTOEXEC_DISABLE = (1 << 22),
USER_FILENOUI = (1 << 23),
USER_NONEGFRAMES = (1 << 24),
USER_TXT_TABSTOSPACES_DISABLE = (1 << 25),
USER_FLAG_UNUSED_2 = (1 << 2), /* cleared */
USER_FLAG_UNUSED_3 = (1 << 3), /* cleared */
USER_FLAG_UNUSED_4 = (1 << 4), /* cleared */
USER_TRACKBALL = (1 << 5),
USER_FLAG_UNUSED_6 = (1 << 6), /* cleared */
USER_FLAG_UNUSED_7 = (1 << 7), /* cleared */
USER_MAT_ON_OB = (1 << 8),
USER_FLAG_UNUSED_9 = (1 << 9), /* cleared */
USER_DEVELOPER_UI = (1 << 10),
USER_TOOLTIPS = (1 << 11),
USER_TWOBUTTONMOUSE = (1 << 12),
USER_NONUMPAD = (1 << 13),
USER_FLAG_UNUSED_14 = (1 << 14), /* cleared */
USER_FILECOMPRESS = (1 << 15),
USER_SAVE_PREVIEWS = (1 << 16),
USER_CUSTOM_RANGE = (1 << 17),
USER_ADD_EDITMODE = (1 << 18),
USER_ADD_VIEWALIGNED = (1 << 19),
USER_RELPATHS = (1 << 20),
USER_RELEASECONFIRM = (1 << 21),
USER_SCRIPT_AUTOEXEC_DISABLE = (1 << 22),
USER_FILENOUI = (1 << 23),
USER_NONEGFRAMES = (1 << 24),
USER_TXT_TABSTOSPACES_DISABLE = (1 << 25),
USER_TOOLTIPS_PYTHON = (1 << 26),
} eUserPref_Flag;
@ -862,8 +862,8 @@ typedef enum eWalkNavigation_Flag {
/** #UserDef.uiflag */
typedef enum eUserpref_UI_Flag {
USER_UIFLAG_DEPRECATED_0 = (1 << 0), /* cleared */
USER_UIFLAG_DEPRECATED_1 = (1 << 1), /* cleared */
USER_UIFLAG_UNUSED_0 = (1 << 0), /* cleared */
USER_UIFLAG_UNUSED_1 = (1 << 1), /* cleared */
USER_WHEELZOOMDIR = (1 << 2),
USER_FILTERFILEEXTS = (1 << 3),
USER_DRAWVIEWINFO = (1 << 4),
@ -875,7 +875,7 @@ typedef enum eUserpref_UI_Flag {
USER_MENUOPENAUTO = (1 << 9),
USER_DEPTH_CURSOR = (1 << 10),
USER_AUTOPERSP = (1 << 11),
USER_UIFLAG_DEPRECATED_12 = (1 << 12), /* cleared */
USER_UIFLAG_UNUSED_12 = (1 << 12), /* cleared */
USER_GLOBALUNDO = (1 << 13),
USER_ORBIT_SELECTION = (1 << 14),
USER_DEPTH_NAVIGATE = (1 << 15),
@ -885,7 +885,7 @@ typedef enum eUserpref_UI_Flag {
USER_CAM_LOCK_NO_PARENT = (1 << 19),
USER_ZOOM_TO_MOUSEPOS = (1 << 20),
USER_SHOW_FPS = (1 << 21),
USER_UIFLAG_DEPRECATED_22 = (1 << 22), /* cleared */
USER_UIFLAG_UNUSED_22 = (1 << 22), /* cleared */
USER_MENUFIXEDORDER = (1 << 23),
USER_CONTINUOUS_MOUSE = (1 << 24),
USER_ZOOM_INVERT = (1 << 25),
@ -901,10 +901,10 @@ typedef enum eUserpref_UI_Flag {
*
* \note don't add new flags here, use 'uiflag' which has flags free. */
typedef enum eUserpref_UI_Flag2 {
USER_UIFLAG2_DEPRECATED_0 = (1 << 0), /* cleared */
USER_REGION_OVERLAP = (1 << 1),
USER_TRACKPAD_NATURAL = (1 << 2),
USER_UIFLAG2_DEPRECATED_3 = (1 << 3), /* dirty */
USER_UIFLAG2_UNUSED_0 = (1 << 0), /* cleared */
USER_REGION_OVERLAP = (1 << 1),
USER_TRACKPAD_NATURAL = (1 << 2),
USER_UIFLAG2_UNUSED_3 = (1 << 3), /* dirty */
} eUserpref_UI_Flag2;
typedef enum eUserpref_GPU_Flag {
@ -963,15 +963,15 @@ typedef enum eAutokey_Flag {
/** #UserDef.transopts */
typedef enum eUserpref_Translation_Flags {
USER_TR_TOOLTIPS = (1 << 0),
USER_TR_IFACE = (1 << 1),
USER_TR_DEPRECATED_2 = (1 << 2), /* cleared */
USER_TR_DEPRECATED_3 = (1 << 3), /* cleared */
USER_TR_DEPRECATED_4 = (1 << 4), /* cleared */
USER_DOTRANSLATE = (1 << 5),
USER_TR_DEPRECATED_6 = (1 << 6), /* cleared */
USER_TR_DEPRECATED_7 = (1 << 7), /* cleared */
USER_TR_NEWDATANAME = (1 << 8),
USER_TR_TOOLTIPS = (1 << 0),
USER_TR_IFACE = (1 << 1),
USER_TR_UNUSED_2 = (1 << 2), /* cleared */
USER_TR_UNUSED_3 = (1 << 3), /* cleared */
USER_TR_UNUSED_4 = (1 << 4), /* cleared */
USER_DOTRANSLATE = (1 << 5),
USER_TR_UNUSED_6 = (1 << 6), /* cleared */
USER_TR_UNUSED_7 = (1 << 7), /* cleared */
USER_TR_NEWDATANAME = (1 << 8),
} eUserpref_Translation_Flags;
/** #UserDef.dupflag */
@ -1011,8 +1011,8 @@ typedef enum eText_Draw_Options {
/** Grease Pencil Settings.
* #UserDef.gp_settings */
typedef enum eGP_UserdefSettings {
GP_PAINT_DEPRECATED_0 = (1 << 0),
GP_PAINT_DOSIMPLIFY = (1 << 1),
GP_PAINT_UNUSED_0 = (1 << 0),
GP_PAINT_DOSIMPLIFY = (1 << 1),
} eGP_UserdefSettings;
enum {

22
source/blender/makesdna/DNA_view3d_types.h
View File

@ -325,14 +325,14 @@ typedef struct View3D {
#define V3D_S3D_DISPVOLUME (1 << 2)
/* View3D->flag (short) */
#define V3D_FLAG_DEPRECATED_0 (1 << 0) /* cleared */
#define V3D_FLAG_DEPRECATED_1 (1 << 1) /* cleared */
#define V3D_FLAG_UNUSED_0 (1 << 0) /* cleared */
#define V3D_FLAG_UNUSED_1 (1 << 1) /* cleared */
#define V3D_HIDE_HELPLINES (1 << 2)
#define V3D_INVALID_BACKBUF (1 << 3)
#define V3D_FLAG_DEPRECATED_10 (1 << 10) /* cleared */
#define V3D_FLAG_UNUSED_10 (1 << 10) /* cleared */
#define V3D_SELECT_OUTLINE (1 << 11)
#define V3D_FLAG_DEPRECATED_12 (1 << 12) /* cleared */
#define V3D_FLAG_UNUSED_12 (1 << 12) /* cleared */
#define V3D_GLOBAL_STATS (1 << 13)
#define V3D_DRAW_CENTERS (1 << 15)
@ -374,19 +374,19 @@ typedef struct View3D {
/* View3d->flag2 (int) */
#define V3D_HIDE_OVERLAYS (1 << 2)
#define V3D_FLAG2_DEPRECATED_3 (1 << 3) /* cleared */
#define V3D_FLAG2_UNUSED_3 (1 << 3) /* cleared */
#define V3D_SHOW_ANNOTATION (1 << 4)
#define V3D_LOCK_CAMERA (1 << 5)
#define V3D_FLAG2_DEPRECATED_6 (1 << 6) /* cleared */
#define V3D_FLAG2_UNUSED_6 (1 << 6) /* cleared */
#define V3D_SHOW_RECONSTRUCTION (1 << 7)
#define V3D_SHOW_CAMERAPATH (1 << 8)
#define V3D_SHOW_BUNDLENAME (1 << 9)
#define V3D_FLAG2_DEPRECATED_10 (1 << 10) /* cleared */
#define V3D_FLAG2_UNUSED_10 (1 << 10) /* cleared */
#define V3D_RENDER_BORDER (1 << 11)
#define V3D_FLAG2_DEPRECATED_12 (1 << 12) /* cleared */
#define V3D_FLAG2_DEPRECATED_13 (1 << 13) /* cleared */
#define V3D_FLAG2_DEPRECATED_14 (1 << 14) /* cleared */
#define V3D_FLAG2_DEPRECATED_15 (1 << 15) /* cleared */
#define V3D_FLAG2_UNUSED_12 (1 << 12) /* cleared */
#define V3D_FLAG2_UNUSED_13 (1 << 13) /* cleared */
#define V3D_FLAG2_UNUSED_14 (1 << 14) /* cleared */
#define V3D_FLAG2_UNUSED_15 (1 << 15) /* cleared */
/* View3d->gp_flag (short) */
#define V3D_GP_SHOW_PAPER (1 << 0) /* Activate paper to cover all viewport */

12
source/blender/makesdna/DNA_world_types.h
View File

@ -98,13 +98,13 @@ typedef struct World {
/* mode */
#define WO_MIST (1 << 0)
#define WO_MODE_DEPRECATED_1 (1 << 1) /* cleared */
#define WO_MODE_DEPRECATED_2 (1 << 2) /* cleared */
#define WO_MODE_DEPRECATED_3 (1 << 3) /* cleared */
#define WO_MODE_DEPRECATED_4 (1 << 4) /* cleared */
#define WO_MODE_DEPRECATED_5 (1 << 5) /* cleared */
#define WO_MODE_UNUSED_1 (1 << 1) /* cleared */
#define WO_MODE_UNUSED_2 (1 << 2) /* cleared */
#define WO_MODE_UNUSED_3 (1 << 3) /* cleared */
#define WO_MODE_UNUSED_4 (1 << 4) /* cleared */
#define WO_MODE_UNUSED_5 (1 << 5) /* cleared */
#define WO_AMB_OCC (1 << 6)
#define WO_MODE_DEPRECATED_7 (1 << 7) /* cleared */
#define WO_MODE_UNUSED_7 (1 << 7) /* cleared */
enum {
WO_MIST_QUADRATIC = 0,