diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/makesdna/DNA_object_types.h | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 0a454d4f281..cb39655ddc9 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -183,17 +183,16 @@ typedef struct Object { short transflag, protectflag; /* transformation settings and transform locks */ short trackflag, upflag; short nlaflag; /* used for DopeSheet filtering settings (expanded/collapsed) */ - short ipoflag; // xxx deprecated... old animation system short scaflag; /* ui state for game logic */ char scavisflag; /* more display settings for game logic */ char depsflag; - /* dupli-frame settings */ - int dupon, dupoff, dupsta, dupend; - /* did last modifier stack generation need mapping support? */ char lastNeedMapping; /* bool */ - char pad[3]; + char pad; + + /* dupli-frame settings */ + int dupon, dupoff, dupsta, dupend; /* during realtime */ @@ -223,6 +222,8 @@ typedef struct Object { float step_height; float jump_speed; float fall_speed; + unsigned char max_jumps; + char pad2[3]; /** Collision mask settings */ unsigned short col_group, col_mask; @@ -296,6 +297,8 @@ typedef struct Object { ListBase lodlevels; /* contains data for levels of detail */ LodLevel *currentlod; + + struct PreviewImage *preview; } Object; /* Warning, this is not used anymore because hooks are now modifiers */ @@ -415,13 +418,6 @@ enum { OB_DUPLI = OB_DUPLIFRAMES | OB_DUPLIVERTS | OB_DUPLIGROUP | OB_DUPLIFACES | OB_DUPLIPARTS, }; -/* (short) ipoflag */ -/* XXX: many old flags for features removed due to incompatibility - * with new system and/or other design issues were here - */ - /* for stride/path editing (XXX: NEEDS REVIEW) */ -#define OB_DISABLE_PATH (1 << 10) - /* (short) trackflag / upflag */ enum { OB_POSX = 0, |