[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42287] branches/bmesh/blender/source/ blender: remove wrong solidify & draw changes i had checked in here and had also proposed for trunk , because the problem was fixed differently in trunk.

[Andrew Wiggin]

Revision: 42287
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42287
Author:   ender79
Date:     2011-11-30 06:27:38 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-11-30 06:24:39 UTC (rev 42286)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-11-30 06:27:38 UTC (rev 42287)
@@ -893,18 +893,16 @@
 	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= setMaterial(mf->mat_nr + 1, NULL);
+			else if (setDrawOptions != NULL)
+				draw= setDrawOptions(userData, orig, &drawSmooth);
 
-			if (orig == ORIGINDEX_NONE) {
-				draw = draw && setMaterial(mf->mat_nr + 1, NULL);
-			}
-			else if (setDrawOptions != NULL) {
-				draw = draw && setDrawOptions(userData, orig, &drawSmooth);
-			}
-
 			if(draw) {
 				unsigned char *cp = NULL;
 
@@ -991,7 +989,7 @@
 					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 @@
 
 					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

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c	2011-11-30 06:24:39 UTC (rev 42286)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c	2011-11-30 06:27:38 UTC (rev 42287)
@@ -593,10 +593,6 @@
 			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<mpoly[fidx].totloop; k1++, ml2++) {