diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-14 19:47:32 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-14 19:47:32 +0400 |
| commit | 0ba5cf245023e8c2310cdcbfe03d9da21d9330a5 (patch) | |
| tree | 34c2683f278df52b48df334126690fd7e744672f /source/blender/makesdna/DNA_object_types.h | |
| parent | c32fce07051572460070fb36ce85519565899c92 (diff) | |
2.5/Paint modes:
* Fixed one of the items from Brecht's TODO mail. Exiting edit mode now restores any paint mode you might have been in, rather than going to object mode.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index ae9d775a74a..35fd4a28cc3 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -227,7 +227,8 @@ typedef struct Object { int lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ unsigned int state; /* bit masks of game controllers that are active */ unsigned int init_state; /* bit masks of initial state as recorded by the users */ - int pad2; + + int restore_mode; /* Keep track of what mode to return to after edit mode exits */ ListBase gpulamp; /* runtime, for lamps only */ } Object; |