blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: remove unused MetaBalle.disp & rot

This commit is contained in:
Campbell Barton 2023-01-18 17:17:31 +11:00
parent 988bc3dddf
commit 07af7e2266
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/mball.cc
View File

@ -85,9 +85,6 @@ static void metaball_free_data(ID *id)
MEM_SAFE_FREE(metaball->mat);
BLI_freelistN(&metaball->elems);
if (metaball->disp.first) {
BKE_displist_free(&metaball->disp);
}
}
static void metaball_foreach_id(ID *id, LibraryForeachIDData *data)
@ -103,7 +100,6 @@ static void metaball_blend_write(BlendWriter *writer, ID *id, const void *id_add
MetaBall *mb = (MetaBall *)id;
/* Clean up, important in undo case to reduce false detection of changed datablocks. */
BLI_listbase_clear(&mb->disp);
mb->editelems = nullptr;
/* Must always be cleared (meta's don't have their own edit-data). */
mb->needs_flush_to_id = 0;
@ -134,7 +130,6 @@ static void metaball_blend_read_data(BlendDataReader *reader, ID *id)
BLO_read_list(reader, &(mb->elems));
BLI_listbase_clear(&mb->disp);
mb->editelems = nullptr;
/* Must always be cleared (meta's don't have their own edit-data). */
mb->needs_flush_to_id = 0;

9
source/blender/makesdna/DNA_meta_types.h
View File

@ -54,7 +54,6 @@ typedef struct MetaBall {
struct AnimData *adt;
ListBase elems;
ListBase disp;
/** Not saved in files, note we use pointer for editmode check. */
ListBase *editelems;
/** Old animation system, deprecated for 2.5. */
@ -76,10 +75,8 @@ typedef struct MetaBall {
*/
char needs_flush_to_id;
/* texture space, copied as one block in editobject.c */
float loc[3];
float size[3];
float rot[3];
/** Display and render res. */
float wiresize, rendersize;
@ -89,9 +86,11 @@ typedef struct MetaBall {
* but these may also have their own thresh as an offset */
float thresh;
/* used in editmode */
// ListBase edit_elems;
char _pad0[4];
/** The active meta-element (used in edit-mode). */
MetaElem *lastelem;
} MetaBall;
/* **************** METABALL ********************* */