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/metaball/editmball_undo.c | |
| parent | 3fe0c32fae20be4146bfa20fe64f56f5716a132b (diff) | |
| parent | 7ad21c3876c2453f11fd509a0157639d615567fc (diff) | |
Merge branch 'master' into blender-v2.80-releasev2.80-rc1
Diffstat (limited to 'source/blender/editors/metaball/editmball_undo.c')
| -rw-r--r-- | source/blender/editors/metaball/editmball_undo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c index d255fac26ad..9a95560ccdd 100644 --- a/source/blender/editors/metaball/editmball_undo.c +++ b/source/blender/editors/metaball/editmball_undo.c @@ -185,7 +185,8 @@ static bool mball_undosys_step_encode(struct bContext *C, static void mball_undosys_step_decode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p, - int UNUSED(dir)) + int UNUSED(dir), + bool UNUSED(is_final)) { MBallUndoStep *us = (MBallUndoStep *)us_p; |