diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-07 08:52:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-07 08:56:21 +0300 |
commit | 79b703bb635ea719bbe31c1ece9884d2d298eaef (patch) | |
tree | 7ee7e896e8e66233f85dd425708a595f66607f48 /source/blender/makesdna/DNA_meta_types.h | |
parent | 85637311c28f49b55286d3287d4c7cefbcbca18a (diff) |
Fix T69822: Switching sculpt objects breaks undo
This introduces object mode tagging for data which hasn't yet been
written back to the ID data.
Now when selecting other sculpt objects, the original objects data is
flushed back to the ID before writing a memfile undo step.
Diffstat (limited to 'source/blender/makesdna/DNA_meta_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meta_types.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index c98842eb6d7..8b218dd7ce6 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -81,7 +81,13 @@ typedef struct MetaBall { short totcol; /** Used to store MB_AUTOSPACE. */ short texflag; - char _pad[2]; + char _pad[1]; + + /** + * ID data is older than edit-mode data (TODO: move to edit-mode struct). + * Set #Main.is_memfile_undo_flush_needed when enabling. + */ + char needs_flush_to_id; /* texture space, copied as one block in editobject.c */ float loc[3]; |