diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-14 17:12:05 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-14 17:25:51 +0300 |
| commit | 400d59be9b058d4bfa31a84547591275f7c700b9 (patch) | |
| tree | 0eab1d5d1d2ec4cad8b7ae345c996a826fd0af6b /source/blender/makesdna/DNA_object_types.h | |
| parent | 99b7dc60bef5ff8680889ae8bcca1a8b14023402 (diff) | |
DNA: Add dedicated recalc flag to ID
Currently unused, but this is where LIB_TAG_ID_RECALC* flags will go.
Also modified other DNA to make pointer property being followed by pointer.
Makes it easier to keep track of alignment and extend nested structures without
ruining anything.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 80fa29a9c43..a9c36007d9c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -137,6 +137,7 @@ typedef struct Object { bAnimVizSettings avs; /* settings for visualization of object-transform animation */ bMotionPath *mpath; /* motion path cache for this object */ + void *pad1; ListBase constraintChannels DNA_DEPRECATED; // XXX deprecated... old animation system ListBase effect DNA_DEPRECATED; // XXX deprecated... keep for readfile @@ -253,8 +254,6 @@ typedef struct Object { int gameflag; int gameflag2; - struct BulletSoftBody *bsoft; /* settings for game engine bullet soft body */ - char restrictflag; /* for restricting view, select, render etc. accessible in outliner */ char recalc; /* dependency flag */ short softflag; /* softbody settings */ @@ -265,6 +264,7 @@ typedef struct Object { ListBase hooks DNA_DEPRECATED; // XXX deprecated... old animation system ListBase particlesystem; /* particle systems */ + struct BulletSoftBody *bsoft; /* settings for game engine bullet soft body */ struct PartDeflect *pd; /* particle deflector/attractor/collision data */ struct SoftBody *soft; /* if exists, saved in file */ struct Group *dup_group; /* object duplicator for group */ @@ -294,6 +294,7 @@ typedef struct Object { float ima_ofs[2]; /* offset for image empties */ ImageUser *iuser; /* must be non-null when oject is an empty image */ + void *pad3; ListBase lodlevels; /* contains data for levels of detail */ LodLevel *currentlod; |