diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
| commit | 06312c6d2db8a6d959bed153f76a28f9faf866f8 (patch) | |
| tree | 0c0e419621bf295ca18133d84eb6d35897584d7d /source/blender/editors/undo/memfile_undo.c | |
| parent | 3fe0c32fae20be4146bfa20fe64f56f5716a132b (diff) | |
| parent | 7ad21c3876c2453f11fd509a0157639d615567fc (diff) | |
Merge branch 'master' into blender-v2.80-releasev2.80-rc1
Diffstat (limited to 'source/blender/editors/undo/memfile_undo.c')
| -rw-r--r-- | source/blender/editors/undo/memfile_undo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index 0f495d64b29..f3e2ee92558 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -83,10 +83,8 @@ static bool memfile_undosys_step_encode(struct bContext *UNUSED(C), return true; } -static void memfile_undosys_step_decode(struct bContext *C, - struct Main *bmain, - UndoStep *us_p, - int UNUSED(dir)) +static void memfile_undosys_step_decode( + struct bContext *C, struct Main *bmain, UndoStep *us_p, int UNUSED(dir), bool UNUSED(is_final)) { ED_editors_exit(bmain, false); |