diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 18:46:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 18:59:34 +0300 |
commit | 566f4e06ba39665bbaabdada6766daa973dbc911 (patch) | |
tree | 3889ede25f5d15b8aa67b9f800c617938e9f5286 /source/blender | |
parent | e7ca9d3477393eb3e15f6916982fa43d97dfc49e (diff) |
Cleanup: move metaball undo into own file
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/metaball/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/metaball/editmball_undo.c | 131 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 93 |
3 files changed, 132 insertions, 93 deletions
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 0f9de8dbf87..7815240b7a4 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -34,6 +34,7 @@ set(INC_SYS ) set(SRC + editmball_undo.c mball_edit.c mball_ops.c diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c new file mode 100644 index 00000000000..974bfb237d3 --- /dev/null +++ b/source/blender/editors/metaball/editmball_undo.c @@ -0,0 +1,131 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/editors/metaball/editmball_undo.c + * \ingroup edmeta + */ + +#include <math.h> +#include <string.h> + +#include "MEM_guardedalloc.h" + +#include "BLI_utildefines.h" +#include "BLI_listbase.h" + +#include "DNA_defs.h" +#include "DNA_meta_types.h" +#include "DNA_object_types.h" + +#include "BKE_context.h" + +#include "ED_mball.h" +#include "ED_util.h" + +typedef struct UndoMBall { + ListBase editelems; + int lastelem_index; +} UndoMBall; + +/* free all MetaElems from ListBase */ +static void freeMetaElemlist(ListBase *lb) +{ + MetaElem *ml; + + if (lb == NULL) { + return; + } + + while ((ml = BLI_pophead(lb))) { + MEM_freeN(ml); + } +} + +static void undoMball_to_editMball(void *umb_v, void *mb_v, void *UNUSED(obdata)) +{ + MetaBall *mb = mb_v; + UndoMBall *umb = umb_v; + + freeMetaElemlist(mb->editelems); + mb->lastelem = NULL; + + /* copy 'undo' MetaElems to 'edit' MetaElems */ + int index = 0; + for (MetaElem *ml_undo = umb->editelems.first; ml_undo; ml_undo = ml_undo->next, index += 1) { + MetaElem *ml_edit = MEM_dupallocN(ml_undo); + BLI_addtail(mb->editelems, ml_edit); + if (index == umb->lastelem_index) { + mb->lastelem = ml_edit; + } + } + +} + +static void *editMball_to_undoMball(void *mb_v, void *UNUSED(obdata)) +{ + MetaBall *mb = mb_v; + UndoMBall *umb; + + /* allocate memory for undo ListBase */ + umb = MEM_callocN(sizeof(UndoMBall), __func__); + umb->lastelem_index = -1; + + /* copy contents of current ListBase to the undo ListBase */ + int index = 0; + for (MetaElem *ml_edit = mb->editelems->first; ml_edit; ml_edit = ml_edit->next, index += 1) { + MetaElem *ml_undo = MEM_dupallocN(ml_edit); + BLI_addtail(&umb->editelems, ml_undo); + if (ml_edit == mb->lastelem) { + umb->lastelem_index = index; + } + } + + return umb; +} + +/* free undo ListBase of MetaElems */ +static void free_undoMball(void *umb_v) +{ + UndoMBall *umb = umb_v; + + freeMetaElemlist(&umb->editelems); + MEM_freeN(umb); +} + +static MetaBall *metaball_get_obdata(Object *ob) +{ + if (ob && ob->type == OB_MBALL) { + return ob->data; + } + return NULL; +} + + +static void *get_data(bContext *C) +{ + Object *obedit = CTX_data_edit_object(C); + return metaball_get_obdata(obedit); +} + +/* this is undo system for MetaBalls */ +void undo_push_mball(bContext *C, const char *name) +{ + undo_editmode_push(C, name, get_data, free_undoMball, undoMball_to_editMball, editMball_to_undoMball, NULL); +} diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index e948de02f40..27140bcdf3b 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -29,7 +29,6 @@ * \ingroup edmeta */ - #include <math.h> #include <string.h> @@ -55,7 +54,6 @@ #include "ED_mball.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_util.h" #include "WM_api.h" #include "WM_types.h" @@ -665,94 +663,3 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese } -/* ************* undo for MetaBalls ************* */ - -typedef struct UndoMBall { - ListBase editelems; - int lastelem_index; -} UndoMBall; - -/* free all MetaElems from ListBase */ -static void freeMetaElemlist(ListBase *lb) -{ - MetaElem *ml; - - if (lb == NULL) return; - - while ((ml = BLI_pophead(lb))) { - MEM_freeN(ml); - } -} - - -static void undoMball_to_editMball(void *umb_v, void *mb_v, void *UNUSED(obdata)) -{ - MetaBall *mb = mb_v; - UndoMBall *umb = umb_v; - - freeMetaElemlist(mb->editelems); - mb->lastelem = NULL; - - /* copy 'undo' MetaElems to 'edit' MetaElems */ - int index = 0; - for (MetaElem *ml_undo = umb->editelems.first; ml_undo; ml_undo = ml_undo->next, index += 1) { - MetaElem *ml_edit = MEM_dupallocN(ml_undo); - BLI_addtail(mb->editelems, ml_edit); - if (index == umb->lastelem_index) { - mb->lastelem = ml_edit; - } - } - -} - -static void *editMball_to_undoMball(void *mb_v, void *UNUSED(obdata)) -{ - MetaBall *mb = mb_v; - UndoMBall *umb; - - /* allocate memory for undo ListBase */ - umb = MEM_callocN(sizeof(UndoMBall), __func__); - umb->lastelem_index = -1; - - /* copy contents of current ListBase to the undo ListBase */ - int index = 0; - for (MetaElem *ml_edit = mb->editelems->first; ml_edit; ml_edit = ml_edit->next, index += 1) { - MetaElem *ml_undo = MEM_dupallocN(ml_edit); - BLI_addtail(&umb->editelems, ml_undo); - if (ml_edit == mb->lastelem) { - umb->lastelem_index = index; - } - } - - return umb; -} - -/* free undo ListBase of MetaElems */ -static void free_undoMball(void *umb_v) -{ - UndoMBall *umb = umb_v; - - freeMetaElemlist(&umb->editelems); - MEM_freeN(umb); -} - -static MetaBall *metaball_get_obdata(Object *ob) -{ - if (ob && ob->type == OB_MBALL) { - return ob->data; - } - return NULL; -} - - -static void *get_data(bContext *C) -{ - Object *obedit = CTX_data_edit_object(C); - return metaball_get_obdata(obedit); -} - -/* this is undo system for MetaBalls */ -void undo_push_mball(bContext *C, const char *name) -{ - undo_editmode_push(C, name, get_data, free_undoMball, undoMball_to_editMball, editMball_to_undoMball, NULL); -} |