diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 16:07:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 16:10:04 +0300 |
| commit | 92094c76a949fb9ad9f85ea09aa1f518b402a916 (patch) | |
| tree | 25ceb40034df4564c6c54f2ac30ebcb6329ce648 /source/blender/makesdna/DNA_object_types.h | |
| parent | ebcea3029d8ffa893431620947caf7e16e6fb8e9 (diff) | |
DNA: remove none particle brush & deprecated flags
The none brush doesn't make sense to have anymore with the tool system.
Also remove deprecated flags & types for object, armature & text.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 050110c14cb..eac8b82d6ea 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -428,12 +428,11 @@ enum { OB_SPEAKER = 12, OB_LIGHTPROBE = 13, -/* OB_WAVE = 21, */ OB_LATTICE = 22, -/* 23 and 24 are for life and sector (old file compat.) */ OB_ARMATURE = 25, -/* Grease Pencil object used in 3D view but not used for annotation in 2D */ + + /** Grease Pencil object used in 3D view but not used for annotation in 2D. */ OB_GPENCIL = 26, OB_TYPE_MAX, @@ -464,35 +463,29 @@ enum { enum { PARTYPE = (1 << 4) - 1, PAROBJECT = 0, -#ifdef DNA_DEPRECATED - PARCURVE = 1, /* Deprecated. */ -#endif - PARKEY = 2, /* XXX Unused, deprecated? */ - PARSKEL = 4, PARVERT1 = 5, PARVERT3 = 6, PARBONE = 7, - PAR_DEPRECATED = 16, }; /* (short) transflag */ enum { - OB_TRANSFLAG_DEPRECATED_0 = 1 << 0, - OB_TRANSFLAG_DEPRECATED_1 = 1 << 1, + OB_TRANSFLAG_DEPRECATED_0 = 1 << 0, /* cleared */ + OB_TRANSFLAG_DEPRECATED_1 = 1 << 1, /* cleared */ OB_NEG_SCALE = 1 << 2, - OB_TRANSFLAG_DEPRECATED_3 = 1 << 3, + OB_TRANSFLAG_DEPRECATED_3 = 1 << 3, /* cleared */ OB_DUPLIVERTS = 1 << 4, OB_DUPLIROT = 1 << 5, - OB_TRANSFLAG_DEPRECATED_4 = 1 << 6, + OB_TRANSFLAG_DEPRECATED_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_TRANSLFAG_DEPRECATED_2 = 1 << 12, + OB_TRANSFLAG_DEPRECATED_12 = 1 << 12, /* cleared */ /* runtime constraints disable */ OB_NO_CONSTRAINTS = 1 << 13, /* hack to work around particle issue */ @@ -623,7 +616,8 @@ enum { /* ob->nlaflag */ enum { - /* WARNING: flags (1 << 0) and (1 << 1) were from old animsys */ + OB_ADS_DEPRECATED_1 = 1 << 0, /* cleared */ + OB_ADS_DEPRECATED_2 = 1 << 1, /* cleared */ /* object-channel expanded status */ OB_ADS_COLLAPSED = 1 << 10, /* object's ipo-block */ |