diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
| commit | a640587e25e43be8007fa0090a59fd9bb6d51e39 (patch) | |
| tree | ef780ec436232535a9e36ac233de1792ee8ba9e4 /source/blender/blenkernel/BKE_blender_undo.h | |
| parent | 99eb95337f74f1a303c774902ea29f7d378bac1b (diff) | |
| parent | 892637f60afbbb787334caa26f5342baf1d4a7d7 (diff) | |
Merge branch 'temp-openxr-blenderside' into soc-2019-openxrsoc-2019-openxr
Diffstat (limited to 'source/blender/blenkernel/BKE_blender_undo.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_undo.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h index 7392d3947a2..4ecedbbfc1e 100644 --- a/source/blender/blenkernel/BKE_blender_undo.h +++ b/source/blender/blenkernel/BKE_blender_undo.h @@ -32,7 +32,10 @@ struct bContext; struct MemFileUndoData *BKE_memfile_undo_encode(struct Main *bmain, struct MemFileUndoData *mfu_prev); -bool BKE_memfile_undo_decode(struct MemFileUndoData *mfu, struct bContext *C); +bool BKE_memfile_undo_decode(struct MemFileUndoData *mfu, + const int undo_direction, + const bool use_old_bmain_data, + struct bContext *C); void BKE_memfile_undo_free(struct MemFileUndoData *mfu); #ifdef __cplusplus |