diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
| commit | 3fdc28b736fc6bbdfec9075b0fdd458897786a59 (patch) | |
| tree | 352f1b1bae7a2deed796797c6c7e6263d8bd1f69 /source/blender/makesdna/DNA_object_types.h | |
| parent | d15c5e51a1f05ff9044bda32cb8c47b6dd59426c (diff) | |
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.
this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 29568fdd0fb..d96b1034614 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -140,7 +140,9 @@ typedef struct Object { /* rot en drot have to be together! (transform('r' en 's')) */ float loc[3], dloc[3], orig[3]; - float size[3], dsize[3]; /* scale and delta scale */ + float size[3]; /* scale infact */ + float dsize[3]; /* DEPRECATED, 2.60 and older only */ + float dscale[3]; /* ack!, changing */ float rot[3], drot[3]; /* euler rotation */ float quat[4], dquat[4]; /* quaternion rotation */ float rotAxis[3], drotAxis[3]; /* axis angle rotation - axis part */ @@ -158,6 +160,8 @@ typedef struct Object { unsigned int lay; /* copy of Base's layer in the scene */ + int pad6; + short flag; /* copy of Base */ short colbits; /* deprecated */ |