diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:41:13 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:41:13 +0400 |
| commit | 2dcb1d70022e06eedfe7339930c3191a8859e7c4 (patch) | |
| tree | 12b70e1e3d02e019348be1f84d6e1d5d84113e22 | |
| parent | 7ef3f98de1339f9b25ce5670b9b5d5e5ef798327 (diff) | |
Remove unused bounding box from MetaBall
--
svn merge -r58150:58151 ^/branches/soc-2013-depsgraph_mt
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_meta_types.h | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 934ccc90199..7d44337bc14 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -200,7 +200,6 @@ void BKE_mball_free(MetaBall *mb) mb->adt = NULL; } if (mb->mat) MEM_freeN(mb->mat); - if (mb->bb) MEM_freeN(mb->bb); BLI_freelistN(&mb->elems); if (mb->disp.first) BKE_displist_free(&mb->disp); } @@ -234,7 +233,6 @@ MetaBall *BKE_mball_copy(MetaBall *mb) for (a = 0; a < mbn->totcol; a++) { id_us_plus((ID *)mbn->mat[a]); } - mbn->bb = MEM_dupallocN(mb->bb); mbn->editelems = NULL; mbn->lastelem = NULL; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 15e3aab2e00..a16b1a72739 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3123,7 +3123,6 @@ static void direct_link_mball(FileData *fd, MetaBall *mb) mb->disp.first = mb->disp.last = NULL; mb->editelems = NULL; - mb->bb = NULL; /* mb->edit_elems.first= mb->edit_elems.last= NULL;*/ mb->lastelem = NULL; } diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 56683bf4797..8bbe53b33a6 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -65,8 +65,6 @@ typedef struct MetaBall { ID id; struct AnimData *adt; - struct BoundBox *bb; - ListBase elems; ListBase disp; ListBase *editelems; /* not saved in files, note we use pointer for editmode check */ |