diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
| commit | f4140f2c8138ec07ba06376c4d0d70d40fca6fad (patch) | |
| tree | b6d7d87fed15896b45b1a1cccfea1175bee0f426 /source/blender/makesdna/DNA_object_types.h | |
| parent | 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b (diff) | |
| parent | c4046e9082f61bfef87173d20c566a065f2602d7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 78c623f6408..79cf5040d9e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -154,6 +154,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 @@ -276,8 +277,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 pad3; short softflag; /* softbody settings */ @@ -288,6 +287,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 */ @@ -300,6 +300,7 @@ typedef struct Object { struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled, store additional settings */ struct DerivedMesh *derivedDeform, *derivedFinal; + void *pad7; uint64_t lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */ unsigned int state; /* bit masks of game controllers that are active */ @@ -317,6 +318,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 *pad4; ListBase lodlevels; /* contains data for levels of detail */ LodLevel *currentlod; @@ -326,7 +328,7 @@ typedef struct Object { struct IDProperty *base_collection_properties; /* used by depsgraph, flushed from base */ ListBase drawdata; /* runtime, ObjectEngineData */ - int pad1; + int pad6; int select_color; /* Mesh structure createrd during object evaluaiton. |