diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-07 06:48:14 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-07 06:48:14 +0400 |
| commit | 3462ddf17f38eb61fc3bb2751d55de15a47455c3 (patch) | |
| tree | 06356ce8240ab36fadac3152cc6eb99789adc425 /source/blender/editors/metaball | |
| parent | 5fc6d567d0c9adf1131ee2f1f2520cf41146b075 (diff) | |
=bmesh=
Cut out some unwanted differences with trunk
in preparation for merge. Also fixed some
warnings, though many remain.
Diffstat (limited to 'source/blender/editors/metaball')
| -rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index c766f05cac9..e8b4f0a1bdc 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -556,7 +556,7 @@ static void freeMetaElemlist(ListBase *lb) } -static void undoMball_to_editMball(void *lbu, void *lbe, void *obdata) +static void undoMball_to_editMball(void *lbu, void *lbe, void *obe) { ListBase *lb= lbu; ListBase *editelems= lbe; @@ -574,7 +574,7 @@ static void undoMball_to_editMball(void *lbu, void *lbe, void *obdata) } -static void *editMball_to_undoMball(void *lbe, void *obdata) +static void *editMball_to_undoMball(void *lbe, void *obe) { ListBase *editelems= lbe; ListBase *lb; |