[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10803] branches/bmesh/source/blender: BMesh Branch

[Joseph Eagar]

Revision: 10803
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10803
Author:   joeedh
Date:     2007-05-29 02:42:56 +0200 (Tue, 29 May 2007)

Log Message:
-----------
BMesh Branch

Removed some spurious (and potentially confusing) stuff from
BKE_DerivedMesh.h.

Modified Paths:
--------------
    branches/bmesh/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/bmesh/source/blender/src/drawobject.c

Modified: branches/bmesh/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/source/blender/blenkernel/BKE_DerivedMesh.h	2007-05-29 00:13:21 UTC (rev 10802)
+++ branches/bmesh/source/blender/blenkernel/BKE_DerivedMesh.h	2007-05-29 00:42:56 UTC (rev 10803)
@@ -74,6 +74,7 @@
 	void (*setMaterials)(void *vself, int totmat, struct Material **materials);
 	void (*beginCache)(void *vself);
 	
+	/*highcols are for drawing transparent highlight faces.*/
 	void (*addTriangle)(void *vself, float verts[][3], float normals[][3], char cols[][3],
 	                              char highcols[4], int mat);
 	                              
@@ -99,21 +100,11 @@
 
 	/*NOTE: does not free the struct pointed to at vself! just direct data*/
 	void (*release)(void *vself);
-
-	/* char *colors is an array of per-triangle colors.*/
-	void (*drawCacheOverloadColors)(void *vself, char *colors, int drawlevel, int flags);
 } bglCacheDrawInterface;
 
-#define BGLC_EnableLighting		1
-#define BGLC_EnableMaterial		2
-#define BGLC_EnableSmooth		4
-#define BGLC_EnableFaces		8
-#define BGLC_EnableWires		16
-#define BGLC_EnablePoints		32
-
-/*theres always one group per material, that is
-  entirely triangles.*/
-
+/** Interal data structure for bglCacheMesh, should not be accessed directly.
+    Note that all this data is converted to opengl arrays and freed on cache->endCache()
+ **/
 typedef struct bglTriangle {
 	struct bglTriangle *next, *prev;
 	float uv[3][2];
@@ -137,6 +128,8 @@
 	char col[3];
 } bglVertPoint;
 
+/*theres always one group per material, that is
+  entirely triangles.*/
 typedef struct bglCacheFaceGroup {
 	float *faceverts;
 	char *facecolors;

Modified: branches/bmesh/source/blender/src/drawobject.c
===================================================================
--- branches/bmesh/source/blender/src/drawobject.c	2007-05-29 00:13:21 UTC (rev 10802)
+++ branches/bmesh/source/blender/src/drawobject.c	2007-05-29 00:42:56 UTC (rev 10803)
@@ -2226,7 +2226,6 @@
 	BGLCache_drawEdgesBackSel,
 	BGLCache_drawVertsBackSel,
 	BGLCache_release,
-	BGLCache_drawCacheOverloadColors
 };
 
 bglCacheDrawInterface *bglCacheNew(void)