diff options
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 963480ddb5d..9cf541fed0c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -295,9 +295,6 @@ typedef struct Object { char pad12; char duplicator_visibility_flag; - /* dupli-frame settings */ - int dupon, dupoff, dupsta, dupend; - /* Depsgraph */ /** Used by depsgraph, flushed from base. */ short base_flag; @@ -324,16 +321,13 @@ typedef struct Object { /** Dupliface scale. */ float dupfacesca; - /** Sf is time-offset. */ - float sf; - /** Custom index, for renderpasses. */ short index; /** Current deformation group, note: index starts at 1. */ unsigned short actdef; /** Current face map, note: index starts at 1. */ unsigned short actfmap; - unsigned char pad5[6]; + unsigned char pad5[2]; /** Object color. */ float col[4]; @@ -501,8 +495,7 @@ enum { PARVERT3 = 6, PARBONE = 7, - /** Slow parenting - is not threadsafe and/or may give errors after jumping. */ - PARSLOW = 16, + PAR_DEPRECATED = 16, }; /* (short) transflag */ @@ -510,10 +503,10 @@ enum { OB_TRANSFLAG_DEPRECATED_0 = 1 << 0, OB_TRANSFLAG_DEPRECATED_1 = 1 << 1, OB_NEG_SCALE = 1 << 2, - OB_DUPLIFRAMES = 1 << 3, + OB_TRANSFLAG_DEPRECATED_3 = 1 << 3, OB_DUPLIVERTS = 1 << 4, OB_DUPLIROT = 1 << 5, - OB_DUPLINOSPEED = 1 << 6, + OB_TRANSFLAG_DEPRECATED_4 = 1 << 6, /* runtime, calculate derivedmesh for dupli before it's used */ OB_DUPLICALCDERIVED = 1 << 7, OB_DUPLICOLLECTION = 1 << 8, @@ -526,7 +519,7 @@ enum { /* hack to work around particle issue */ OB_NO_PSYS_UPDATE = 1 << 14, - OB_DUPLI = OB_DUPLIFRAMES | OB_DUPLIVERTS | OB_DUPLICOLLECTION | OB_DUPLIFACES | OB_DUPLIPARTS, + OB_DUPLI = OB_DUPLIVERTS | OB_DUPLICOLLECTION | OB_DUPLIFACES | OB_DUPLIPARTS, }; /* (short) trackflag / upflag */ |