diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-12 13:02:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-12 13:02:39 +0400 |
| commit | 33bfcb26b8997d68adbfbf5931e2157a6ba9fbce (patch) | |
| tree | fb18a347b2426faa9d2a487363f1d048ddbd6807 /source/blender/makesdna/DNA_key_types.h | |
| parent | 191ad54599b2d8c8677f56870ee1800e62c50137 (diff) | |
manually copy more changes from trunk.
Diffstat (limited to 'source/blender/makesdna/DNA_key_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_key_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 71b631e3d5e..6bdd63f8483 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -45,7 +45,7 @@ typedef struct KeyBlock { float pos; float curval; short type, adrcode, relative, flag; /* relative == 0 means first key is reference */ - int totelem, pad; + int totelem, pad2; void *data; float *weights; @@ -55,7 +55,7 @@ typedef struct KeyBlock { float slidermin; float slidermax; - int uid, pad2; + int uid, pad3; } KeyBlock; |