diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-25 16:30:33 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-25 16:30:33 +0400 |
| commit | 72b501beb6147df1273612e452b761cd26daa256 (patch) | |
| tree | e2a9b3e3a134120f015ba1d62b912ca3bef03dc7 /source/blender/makesdna | |
| parent | 713711b8be9bf7ab050177630ef431ccfc78fe6f (diff) | |
Bugfix #4466 (half)
Object 'active shape' was only 1 byte in object. OK. Let's sacrifice another
byte for that then!
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 782b7fdd6cb..e8573f3da4a 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -193,9 +193,11 @@ typedef struct Object { struct Group *dup_group; /* object duplicator for group */ short fluidsimFlag; /* NT toggle fluidsim participation on/off */ - char shapenr, shapeflag; /* current shape key for menu or pinned, flag for pinning */ + short pad3; + short shapenr, shapeflag; /* current shape key for menu or pinned, flag for pinning */ float smoothresh; /* smoothresh is phong interpolation ray_shadow correction in render */ - + int pad4; + struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled, store additional settings */ struct DerivedMesh *derivedDeform, *derivedFinal; |