diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-11-06 09:46:45 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-11-06 09:46:45 +0400 |
| commit | 440c1c2c1745b6d4acd13f405643100cb913fb3b (patch) | |
| tree | 79a6621f6a76b887b3aa78645758d214b5654a04 /source/blender/makesdna/DNA_object_types.h | |
| parent | 4c17f8e5de94f3abc65995e7a2964bb9e6ea7642 (diff) | |
As discussed on the mailing list, removing the non-functional,
incompatible, and unmaintainable Time Offset cruft.
- Slow Parenting lives another day (just), although it now carries
appropriate cautionary disclaimers. It's only really for the Game
Engine nowadays, as that's the only place where it can possibly work
with any reliability.
- "Animation Hacks" panel is now "Relations Extras". I could've merged
the two panels, though I figured these options weren't that frequently
used to justify taking up screen-space by default along with the panel
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3306b9e97bc..29568fdd0fb 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -163,7 +163,8 @@ typedef struct Object { short transflag, protectflag; /* transformation settings and transform locks */ short trackflag, upflag; - short nlaflag, ipoflag; // xxx depreceated... old animation system + short nlaflag; /* used for DopeSheet filtering settings (expanded/collapsed) */ + short ipoflag; // xxx depreceated... old animation system short scaflag; /* ui state for game logic */ char scavisflag; /* more display settings for game logic */ char pad5; @@ -325,11 +326,12 @@ typedef struct DupliObject { #define PARVERT1 5 #define PARVERT3 6 #define PARBONE 7 + + /* slow parenting - is not threadsafe and/or may give errors after jumping */ #define PARSLOW 16 /* (short) transflag */ -/*#define OB_OFFS_LOCAL 1*/ /*UNUSED*/ -/* #define OB_QUAT 2 */ /* never used, free flag */ +/* flags 1 and 2 were unused or relics from past features */ #define OB_NEG_SCALE 4 #define OB_DUPLI (8+16+256+512+2048) #define OB_DUPLIFRAMES 8 @@ -345,24 +347,12 @@ typedef struct DupliObject { #define OB_NO_CONSTRAINTS 8192 /* runtime constraints disable */ /* (short) ipoflag */ - // XXX depreceated - old animation system crap -#define OB_DRAWKEY 1 -#define OB_DRAWKEYSEL 2 -#define OB_OFFS_OB 4 -/* #define OB_OFFS_MAT 8 */ /*UNUSED*/ -/* #define OB_OFFS_VKEY 16 */ /*UNUSED*/ -/* #define OB_OFFS_PATH 32 */ /*UNUSED*/ -#define OB_OFFS_PARENT 64 -#define OB_OFFS_PARTICLE 128 - /* get ipo from from action or not? */ -#define OB_ACTION_OB 256 -#define OB_ACTION_KEY 512 - /* for stride edit */ +/* XXX: many old flags for features removed due to incompatability + * with new system and/or other design issues were here + */ + /* for stride/path editing (XXX: NEEDS REVIEW) */ #define OB_DISABLE_PATH 1024 -#define OB_OFFS_PARENTADD 2048 - - /* (short) trackflag / upflag */ #define OB_POSX 0 #define OB_POSY 1 @@ -529,10 +519,7 @@ typedef struct DupliObject { #define OB_SHAPE_EDIT_MODE 4 /* ob->nlaflag */ - // XXX depreceated - old animation system -#define OB_NLA_OVERRIDE (1<<0) -#define OB_NLA_COLLAPSED (1<<1) - + /* WARNING: flags (1<<0) and (1<<1) were from old animsys */ /* object-channel expanded status */ #define OB_ADS_COLLAPSED (1<<10) /* object's ipo-block */ |