Commit: 07af7e2266676f2493b593d0c69e8668571dd0cf Author: Campbell Barton Date: Wed Jan 18 17:17:31 2023 +1100 Branches: master https://developer.blender.org/rB07af7e2266676f2493b593d0c69e8668571dd0cf
Cleanup: remove unused MetaBalle.disp & rot =================================================================== M source/blender/blenkernel/intern/mball.cc M source/blender/makesdna/DNA_meta_types.h =================================================================== diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index c1421db913d..c5025e51eb8 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -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; diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index b4a66a46efe..5650fe91696 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -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 ********************* */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs