kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

remove wrong solidify & draw changes i had checked in here and had also proposed for trunk, because the problem was fixed differently in trunk.

Browse Source 
#-This line, and those below, will be ignored--

M    source/blender/modifiers/intern/MOD_solidify.c
M    source/blender/blenkernel/intern/cdderivedmesh.c
This commit is contained in:
Andrew Wiggin 2011-11-30 06:27:38 +00:00
parent faa022563d
commit 274080025d
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@ -893,17 +893,15 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
if( GPU_buffer_legacy(dm) || G.f & G_BACKBUFSEL) { if( GPU_buffer_legacy(dm) || G.f & G_BACKBUFSEL) {
DEBUG_VBO( "Using legacy code. cdDM_drawMappedFaces\n" ); DEBUG_VBO( "Using legacy code. cdDM_drawMappedFaces\n" );
for(i = 0; i < dm->numFaceData; i++, mf++) { for(i = 0; i < dm->numFaceData; i++, mf++) {
int drawSmooth = (mf->flag & ME_SMOOTH) != 0; int drawSmooth = (mf->flag & ME_SMOOTH);
int draw = (mf->flag & ME_HIDE) == 0; int draw= 1;
orig= (index==NULL) ? i : *index++; orig= (index==NULL) ? i : *index++;
if (orig == ORIGINDEX_NONE) { if(orig == ORIGINDEX_NONE)
draw = draw && setMaterial(mf->mat_nr + 1, NULL); draw= setMaterial(mf->mat_nr + 1, NULL);
} else if (setDrawOptions != NULL)
else if (setDrawOptions != NULL) { draw= setDrawOptions(userData, orig, &drawSmooth);
draw = draw && setDrawOptions(userData, orig, &drawSmooth);
}
if(draw) { if(draw) {
unsigned char *cp = NULL; unsigned char *cp = NULL;
@ -991,7 +989,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
int actualFace = next_actualFace; int actualFace = next_actualFace;
MFace *mface= mf + actualFace; MFace *mface= mf + actualFace;
int drawSmooth= (mface->flag & ME_SMOOTH); int drawSmooth= (mface->flag & ME_SMOOTH);
int draw = (mf->flag & ME_HIDE) == 0; int draw = 1;
int flush = 0; int flush = 0;
if(i != tottri-1) if(i != tottri-1)
@ -999,12 +997,10 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
orig= (index==NULL) ? actualFace : index[actualFace]; orig= (index==NULL) ? actualFace : index[actualFace];
if (orig == ORIGINDEX_NONE) { if(orig == ORIGINDEX_NONE)
draw = draw && setMaterial(mface->mat_nr + 1, NULL); draw= setMaterial(mface->mat_nr + 1, NULL);
} else if (setDrawOptions != NULL)
else if (setDrawOptions != NULL) { draw= setDrawOptions(userData, orig, &drawSmooth);
draw = draw && setDrawOptions(userData, orig, &drawSmooth);
}
/* Goal is to draw as long of a contiguous triangle /* Goal is to draw as long of a contiguous triangle
array as possible, so draw when we hit either an array as possible, so draw when we hit either an

4
source/blender/modifiers/intern/MOD_solidify.c
View File

@ -594,10 +594,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
mp->flag = mpoly[fidx].flag; mp->flag = mpoly[fidx].flag;
mp->totloop = 4; mp->totloop = 4;
/* ME_HIDE for rim faces should match that of the rim edge, not the face the edge */
mp->flag &= ~ME_HIDE;
mp->flag |= ed->flag & ME_HIDE;
ml2 = mloop + mpoly[fidx].loopstart; ml2 = mloop + mpoly[fidx].loopstart;
for (k1=0; k1<mpoly[fidx].totloop; k1++, ml2++) { for (k1=0; k1<mpoly[fidx].totloop; k1++, ml2++) {
if (ml2->e == eidx) if (ml2->e == eidx)