diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /source/blender/blenkernel/BKE_pointcache.h | |
parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'source/blender/blenkernel/BKE_pointcache.h')
-rw-r--r-- | source/blender/blenkernel/BKE_pointcache.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index e9be6d9f7ca..4a3dd72836a 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -230,7 +230,6 @@ typedef struct PTCacheEditPoint { } PTCacheEditPoint; typedef struct PTCacheUndo { - struct PTCacheUndo *next, *prev; struct PTCacheEditPoint *points; /* particles stuff */ @@ -243,12 +242,11 @@ typedef struct PTCacheUndo { struct ListBase mem_cache; int totpoint; - char name[64]; + + size_t undo_size; } PTCacheUndo; typedef struct PTCacheEdit { - ListBase undo; - struct PTCacheUndo *curundo; PTCacheEditPoint *points; struct PTCacheID pid; |