From 274080025d315dc08f9291bddc6d4235ed0fc8e0 Mon Sep 17 00:00:00 2001 From: Andrew Wiggin Date: Wed, 30 Nov 2011 06:27:38 +0000 Subject: [PATCH] remove wrong solidify & draw changes i had checked in here and had also proposed for trunk, because the problem was fixed differently in trunk. #-This line, and those below, will be ignored-- M source/blender/modifiers/intern/MOD_solidify.c M source/blender/blenkernel/intern/cdderivedmesh.c --- .../blender/blenkernel/intern/cdderivedmesh.c | 28 ++++++++----------- .../blender/modifiers/intern/MOD_solidify.c | 4 --- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 64d44707cff..1d4e594c8ef 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -893,17 +893,15 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us if( GPU_buffer_legacy(dm) || G.f & G_BACKBUFSEL) { DEBUG_VBO( "Using legacy code. cdDM_drawMappedFaces\n" ); for(i = 0; i < dm->numFaceData; i++, mf++) { - int drawSmooth = (mf->flag & ME_SMOOTH) != 0; - int draw = (mf->flag & ME_HIDE) == 0; + int drawSmooth = (mf->flag & ME_SMOOTH); + int draw= 1; orig= (index==NULL) ? i : *index++; - - if (orig == ORIGINDEX_NONE) { - draw = draw && setMaterial(mf->mat_nr + 1, NULL); - } - else if (setDrawOptions != NULL) { - draw = draw && setDrawOptions(userData, orig, &drawSmooth); - } + + if(orig == ORIGINDEX_NONE) + draw= setMaterial(mf->mat_nr + 1, NULL); + else if (setDrawOptions != NULL) + draw= setDrawOptions(userData, orig, &drawSmooth); if(draw) { unsigned char *cp = NULL; @@ -991,7 +989,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us int actualFace = next_actualFace; MFace *mface= mf + actualFace; int drawSmooth= (mface->flag & ME_SMOOTH); - int draw = (mf->flag & ME_HIDE) == 0; + int draw = 1; int flush = 0; if(i != tottri-1) @@ -999,12 +997,10 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us orig= (index==NULL) ? actualFace : index[actualFace]; - if (orig == ORIGINDEX_NONE) { - draw = draw && setMaterial(mface->mat_nr + 1, NULL); - } - else if (setDrawOptions != NULL) { - draw = draw && setDrawOptions(userData, orig, &drawSmooth); - } + if(orig == ORIGINDEX_NONE) + draw= setMaterial(mface->mat_nr + 1, NULL); + else if (setDrawOptions != NULL) + draw= setDrawOptions(userData, orig, &drawSmooth); /* Goal is to draw as long of a contiguous triangle array as possible, so draw when we hit either an diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index fe17c39610f..cc52439a964 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -593,10 +593,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, mp->loopstart = j+numLoops*2; mp->flag = mpoly[fidx].flag; 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; for (k1=0; k1