Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-31 03:34:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-31 04:07:13 +0300
commit51bba03b319319d59f739673c3fafb71bc308e0d (patch)
tree239eaf352608f35d924061002d4fcb8adb4f3749 /source/blender/editors/metaball/editmball_undo.c
parentd16e4d077dfe4ac887b51075784170911d3adca5 (diff)
Undo System: add Main argument to encode/decode
Needed since we don't always have the context, and avoids adding G_MAIN into undo callbacks.
Diffstat (limited to 'source/blender/editors/metaball/editmball_undo.c')
-rw-r--r--source/blender/editors/metaball/editmball_undo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c
index ebf056f71db..7616fb63256 100644
--- a/source/blender/editors/metaball/editmball_undo.c
+++ b/source/blender/editors/metaball/editmball_undo.c
@@ -157,7 +157,7 @@ static bool mball_undosys_poll(bContext *C)
return editmball_object_from_context(C) != NULL;
}
-static bool mball_undosys_step_encode(struct bContext *C, UndoStep *us_p)
+static bool mball_undosys_step_encode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p)
{
MBallUndoStep *us = (MBallUndoStep *)us_p;
@@ -181,7 +181,7 @@ static bool mball_undosys_step_encode(struct bContext *C, UndoStep *us_p)
return true;
}
-static void mball_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNUSED(dir))
+static void mball_undosys_step_decode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p, int UNUSED(dir))
{
/* TODO(campbell): undo_system: use low-level API to set mode. */
ED_object_mode_set(C, OB_MODE_EDIT);