[Bf-blender-cvs] [8703e2f] master: Code cleanup: remove unused flags

[Campbell Barton]

Commit: 8703e2fe7e97ddad4f7f5bae8e5c801efbf9dddb
Author: Campbell Barton
Date:   Wed Mar 26 07:57:13 2014 +1100
https://developer.blender.org/rB8703e2fe7e97ddad4f7f5bae8e5c801efbf9dddb

Code cleanup: remove unused flags

===================================================================

M	source/blender/blenkernel/intern/mesh_evaluate.c
M	source/blender/makesdna/DNA_meshdata_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index b0a43a2..01e3b7b 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -1744,6 +1744,9 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData
 	int numTex, numCol;
 	int i, j, totloop, totpoly, *polyindex;
 
+	/* old flag, clear to allow for reuse */
+#define ME_FGON (1 << 3)
+
 	/* just in case some of these layers are filled in (can happen with python created meshes) */
 	CustomData_free(ldata, totloop_i);
 	CustomData_free(pdata, totpoly_i);
@@ -1832,6 +1835,9 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData
 	*r_totloop = totloop;
 	*r_mpoly = mpoly;
 	*r_mloop = mloop;
+
+#undef ME_FGON
+
 }
 /** \} */
 
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index c370e67..3304980 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -303,7 +303,6 @@ enum {
 /* mvert->flag */
 enum {
 /*	SELECT              = (1 << 0), */
-	ME_SPHERETEST       = (1 << 1),
 	ME_VERT_TMP_TAG     = (1 << 2),
 	ME_HIDE             = (1 << 4),
 	ME_VERT_MERGED      = (1 << 6),
@@ -315,7 +314,6 @@ enum {
 /*	SELECT              = (1 << 0), */
 	ME_EDGEDRAW         = (1 << 1),
 	ME_SEAM             = (1 << 2),
-	ME_FGON             = (1 << 3),  /* no longer used (now we have ngons), only defined so we can clear it */
 /*	ME_HIDE             = (1 << 4), */
 	ME_EDGERENDER       = (1 << 5),
 	ME_LOOSEEDGE        = (1 << 7),