diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-03 12:24:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-03 12:24:57 +0300 |
| commit | 38bf3b8d23041c547186fee5633782384c8ab384 (patch) | |
| tree | aeef142996ff766f6e679c2f70ba2070b83b366f /source/blender/makesdna/DNA_action_types.h | |
| parent | 18a45538384564a5dffbdd88b778bb10da92a7b2 (diff) | |
| parent | 6221180963c39f9f3f95982070ff6f381ab7e0b2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 0568af454fc..2266390d348 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -677,10 +677,10 @@ typedef enum eDopeSheet_Flag { typedef struct SpaceAction { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale; - - short blockhandler[8]; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* copied to region */ |