archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Add tessellation data to DerivedMesh (LoopTri)

Browse Source 
This stores loop indices into the loop array giving easier acess
to data such as vertex-colors and UV's,
removing the need to store an MFace duplicate of custom-data.

This doesn't yet move all internal code from MFace to LoopTri just yet.

Only applies to:
- opengl drawing
- sculpting (pbvh)
- vertex/weight paint

Thanks to @psy-fi for review, fixes and improvements to drawing!
This commit is contained in:
Campbell Barton
2015-07-17 03:36:03 +10:00
parent c8f6313487
commit 595a491e63
22 changed files with 1106 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/mesh/editface.c
View File

@@ -62,9 +62,8 @@ void paintface_flush_flags(Object *ob)
Mesh *me = BKE_mesh_from_object(ob);
DerivedMesh *dm = ob->derivedFinal;
MPoly *polys, *mp_orig;
MFace *faces;
const int *index_array = NULL;
int totface, totpoly;
int totpoly;
int i;
if (me == NULL)
@@ -79,26 +78,7 @@ void paintface_flush_flags(Object *ob)
if (dm == NULL)
return;
/*
* Try to push updated mesh poly flags to three other data sets:
* - Mesh polys => Mesh tess faces
* - Mesh polys => Final derived polys
* - Final derived polys => Final derived tessfaces
*/
if ((index_array = CustomData_get_layer(&me->fdata, CD_ORIGINDEX))) {
faces = me->mface;
totface = me->totface;
/* loop over tessfaces */
for (i = 0; i < totface; i++) {
if (index_array[i] != ORIGINDEX_NONE) {
/* Copy flags onto the original tessface from its original poly */
mp_orig = me->mpoly + index_array[i];
faces[i].flag = mp_orig->flag;
}
}
}
/* Mesh polys => Final derived polys */
if ((index_array = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX))) {
polys = dm->getPolyArray(dm);
@@ -113,21 +93,6 @@ void paintface_flush_flags(Object *ob)
}
}
}
if ((index_array = CustomData_get_layer(&dm->faceData, CD_ORIGINDEX))) {
polys = dm->getPolyArray(dm);
faces = dm->getTessFaceArray(dm);
totface = dm->getNumTessFaces(dm);
/* loop over tessfaces */
for (i = 0; i < totface; i++) {
if (index_array[i] != ORIGINDEX_NONE) {
/* Copy flags onto the final tessface from its final poly */
mp_orig = polys + index_array[i];
faces[i].flag = mp_orig->flag;
}
}
}
}
void paintface_hide(Object *ob, const bool unselected)