From bd023c443b9619ddfa467da79755204885b61a89 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Feb 2011 13:02:44 +0000 Subject: remove mat_nr from MVert struct, saves 4 bytes per vertex. used to be used for halo's --- source/blender/blenkernel/intern/DerivedMesh.c | 6 ++---- source/blender/blenkernel/intern/cdderivedmesh.c | 1 - source/blender/editors/armature/editarmature.c | 1 - source/blender/editors/mesh/editmesh.c | 16 ---------------- source/blender/makesdna/DNA_meshdata_types.h | 3 +-- 5 files changed, 3 insertions(+), 24 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 658d29f0046..a58aff6d4dc 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1122,8 +1122,7 @@ static void emDM_getVert(DerivedMesh *dm, int index, MVert *vert_r) vert_r->no[1] = ev->no[1] * 32767.0; vert_r->no[2] = ev->no[2] * 32767.0; - /* TODO what to do with vert_r->flag and vert_r->mat_nr? */ - vert_r->mat_nr = 0; + /* TODO what to do with vert_r->flag? */ vert_r->bweight = (unsigned char) (ev->bweight*255.0f); } @@ -1220,8 +1219,7 @@ static void emDM_copyVertArray(DerivedMesh *dm, MVert *vert_r) vert_r->no[1] = ev->no[1] * 32767.0; vert_r->no[2] = ev->no[2] * 32767.0; - /* TODO what to do with vert_r->flag and vert_r->mat_nr? */ - vert_r->mat_nr = 0; + /* TODO what to do with vert_r->flag? */ vert_r->flag = 0; vert_r->bweight = (unsigned char) (ev->bweight*255.0f); } diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 932be711938..0006e5bfa38 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1604,7 +1604,6 @@ DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me)) mv->no[2] = eve->no[2] * 32767.0; mv->bweight = (unsigned char) (eve->bweight * 255.0f); - mv->mat_nr = 0; mv->flag = 0; *index = i; diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 2cdb2c9a062..e7bff9ec203 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -716,7 +716,6 @@ void POSE_OT_armature_apply (wmOperatorType *ot) /* set the current pose as the restpose */ static int pose_visual_transform_apply_exec (bContext *C, wmOperator *UNUSED(op)) { - Scene *scene= CTX_data_scene(C); Object *ob= ED_object_pose_armature(CTX_data_active_object(C)); // must be active object, not edit-object /* don't check if editmode (should be done by caller) */ diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index d1efb60b618..ed9f7edbd22 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -989,8 +989,6 @@ void load_editMesh(Scene *scene, Object *obedit) while(eve) { VECCOPY(mvert->co, eve->co); - mvert->mat_nr= 32767; /* what was this for, halos? */ - /* vertex normal */ VECCOPY(nor, eve->no); mul_v3_fl(nor, 32767.0); @@ -1063,20 +1061,6 @@ void load_editMesh(Scene *scene, Object *obedit) if(efa->f & 1) mface->flag |= ME_FACE_SEL; else mface->flag &= ~ME_FACE_SEL; } - - /* mat_nr in vertex */ - if(me->totcol>1) { - mvert= me->mvert+mface->v1; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - mvert= me->mvert+mface->v2; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - mvert= me->mvert+mface->v3; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - if(mface->v4) { - mvert= me->mvert+mface->v4; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - } - } /* watch: efa->e1->f2==0 means loose edge */ diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 450c56b0dec..9761eda5de7 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -61,8 +61,7 @@ typedef struct MDeformVert { typedef struct MVert { float co[3]; short no[3]; - short mat_nr; - char flag, bweight, pad[2]; + char flag, bweight; } MVert; /* at the moment alpha is abused for vertex painting -- cgit v1.2.3