[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34693] trunk/blender/source/blender: remove mat_nr from MVert struct, saves 4 bytes per vertex.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 7 14:02:44 CET 2011
Revision: 34693
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34693
Author: campbellbarton
Date: 2011-02-07 13:02:44 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
remove mat_nr from MVert struct, saves 4 bytes per vertex.
used to be used for halo's
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-02-07 12:37:14 UTC (rev 34692)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-02-07 13:02:44 UTC (rev 34693)
@@ -1122,8 +1122,7 @@
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 @@
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);
}
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-02-07 12:37:14 UTC (rev 34692)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-02-07 13:02:44 UTC (rev 34693)
@@ -1604,7 +1604,6 @@
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;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-07 12:37:14 UTC (rev 34692)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-07 13:02:44 UTC (rev 34693)
@@ -716,7 +716,6 @@
/* 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) */
Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c 2011-02-07 12:37:14 UTC (rev 34692)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c 2011-02-07 13:02:44 UTC (rev 34693)
@@ -989,8 +989,6 @@
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 @@
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 */
Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2011-02-07 12:37:14 UTC (rev 34692)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2011-02-07 13:02:44 UTC (rev 34693)
@@ -61,8 +61,7 @@
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
More information about the Bf-blender-cvs
mailing list