change TODO -> BMESH_TODO if only on bmesh branch

14 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 7f3c5b02ecb..44f2db93663 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -96,7 +96,7 @@ void CustomData_data_add(int type, void *data1, void *data2);
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
 					 CustomDataMask mask, int alloctype, int totelem);
 
-/* TODO, not really a public function but readfile.c needs it */
+/* BMESH_TODO, not really a public function but readfile.c needs it */
 void CustomData_update_typemap(struct CustomData *data);
 
 /* same as the above, except that this will preserve existing layers, and only
diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c
index 7a53f2c8f94..44726f0ddc7 100644
--- a/source/blender/blenkernel/intern/editderivedbmesh.c
+++ b/source/blender/blenkernel/intern/editderivedbmesh.c
@@ -1286,7 +1286,7 @@ static void bmDM_copyFaceArray(DerivedMesh *dm, MFace *face_r)
 
 		face_r->mat_nr = (unsigned char) ef->mat_nr;
 
-		/*HACK/TODO: need to convert this*/
+		/*HACK/BMESH_TODO: need to convert this*/
 		face_r->flag = ef->head.flag;
 
 		face_r->v1 = BM_GetIndex(l[0]->v);
diff --git a/source/blender/blenlib/BLI_smallhash.h b/source/blender/blenlib/BLI_smallhash.h
index 0301ce6976e..c4711204b8a 100755
--- a/source/blender/blenlib/BLI_smallhash.h
+++ b/source/blender/blenlib/BLI_smallhash.h
@@ -100,7 +100,7 @@ BM_INLINE void BLI_smallhash_insert(SmallHash *hash, uintptr_t key, void *item)
 {
 	int h, hoff=1;
 
-	/* key = ABS(key); TODO: XXXXX this throws error with MSVC (warning as error) */
+	/* key = ABS(key); BMESH_TODO: XXXXX this throws error with MSVC (warning as error) */
 
 	if (hash->size < hash->used*3) {
 		int newsize = hashsizes[++hash->curhash];
@@ -156,7 +156,7 @@ BM_INLINE void BLI_smallhash_remove(SmallHash *hash, uintptr_t key)
 {
 	int h, hoff=1;
 
-	/* key = ABS(key); TODO: XXXXX this throws error with MSVC (warning as error) */
+	/* key = ABS(key); BMESH_TODO: XXXXX this throws error with MSVC (warning as error) */
 	h = key;
 	
 	while (hash->table[h % hash->size].key != key 
@@ -176,7 +176,7 @@ BM_INLINE void *BLI_smallhash_lookup(SmallHash *hash, uintptr_t key)
 {
 	int h, hoff=1;
 
-	/* key = ABS(key); TODO: XXXXX this throws error with MSVC (warning as error) */
+	/* key = ABS(key); BMESH_TODO: XXXXX this throws error with MSVC (warning as error) */
 	h = key;
 	
 	if (!hash->table)
@@ -198,7 +198,7 @@ BM_INLINE int BLI_smallhash_haskey(SmallHash *hash, uintptr_t key)
 {
 	int h = key, hoff=1;
 	h = ABS(h);
-	/* key = ABS(key); TODO: XXXXX this throws error with MSVC (warning as error) */
+	/* key = ABS(key); BMESH_TODO: XXXXX this throws error with MSVC (warning as error) */
 	
 	if (!hash->table)
 		return 0;
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 56a046989aa..1d177aba6d9 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -434,7 +434,7 @@ static void bm_copy_face_attributes(BMesh *source_mesh, BMesh *target_mesh, BMFa
 	target_face->mat_nr = source_face->mat_nr;
 }
 
-/*Todo: Special handling for hide flags?*/
+/*BMESH_TODO: Special handling for hide flags?*/
 
 void BM_Copy_Attributes(BMesh *source_mesh, BMesh *target_mesh, void *source, void *target)
 {
diff --git a/source/blender/bmesh/intern/bmesh_eulers.c b/source/blender/bmesh/intern/bmesh_eulers.c
index 43b1ee76ffd..98d09b8831b 100644
--- a/source/blender/bmesh/intern/bmesh_eulers.c
+++ b/source/blender/bmesh/intern/bmesh_eulers.c
@@ -86,7 +86,7 @@
    *The term "Euler Operator" is actually a misnomer when referring to a non-manifold 
     data structure. Its use is in keeping with the convention established by others.
 
-	TODO:
+	BMESH_TODO:
 	-Make seperate 'debug levels' of validation
 	-Add in the UnglueFaceRegionMakeVert and GlueFaceRegionKillVert eulers.
 
@@ -835,7 +835,7 @@ int bmesh_jekv(BMesh *bm, BMEdge *ke, BMVert *kv)
  *	This euler is a bit peculiar in compairson to others as it is its
  *	own inverse.
  *
- *	TODO: reinsert validation code.
+ *	BMESH_TODO: reinsert validation code.
  *
  *  Returns -
  *	1 for success, 0 for failure.
@@ -1059,7 +1059,7 @@ BMVert *bmesh_urmv(BMesh *bm, BMFace *sf, BMVert *sv)
     int numloops = 0, numedges = 0, i, maxedges, maxloops;
 
 
-    /*Todo: Validation*/
+    /*BMESH_TODO: Validation*/
     /*validate radial cycle of all collected loops*/
     /*validate the disk cycle of sv, and nv*/
     /*validate the face length of all faces? overkill?*/
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 7bcca195cef..32203c30809 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -338,7 +338,7 @@ BMFace *BM_Split_Face(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, BMLoop **nl,
  *
  *  Note that this is not a general edge collapse function.
  *
- *  TODO:
+ *  BMESH_TODO:
  *    Insert error checking for KV valance.
  *
  *  Returns -
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c
index 18a7b279a6f..7dff6fe3807 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_newcore.c
@@ -501,7 +501,7 @@ void BM_Kill_Vert(BMesh *bm, BMVert *v) {
  *	This euler is a bit peculiar in compairson to others as it is its
  *	own inverse.
  *
- *	TODO: reinsert validation code.
+ *	BMESH_TODO: reinsert validation code.
  *
  *  Returns -
  *	1 for success, 0 for failure.
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index a664d6a350e..85c5990b006 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -83,7 +83,7 @@ void BMO_push(BMesh *bm, BMOperator *UNUSED(op))
  *
  * Pops the opstack one level  
  * and frees a flag layer if appropriate
- * TODO: investigate NOT freeing flag
+ * BMESH_TODO: investigate NOT freeing flag
  * layers.
  *
 */
@@ -781,7 +781,7 @@ void BMO_Unflag_Buffer(BMesh *bm, BMOperator *op, const char *slotname, int flag
  *  using a mempool so the allocation/frees
  *  should be quite fast.
  *
- *  TODO:
+ *  BMESH_TODO:
  *	Investigate not freeing flag layers until
  *  all operators have been executed. This would
  *  save a lot of realloc potentially.
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index aafee8a52c2..eafe63ed958 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -22,7 +22,7 @@
  * with polygons (normal/area calculation,
  * tesselation, ect)
  *
- * TODO:
+ * BMESH_TODO:
  *   -Add in Tesselator frontend that creates
  *     BMTriangles from copied faces
  *  -Add in Function that checks for and flags
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 3e2de929eb1..32401662738 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -395,7 +395,7 @@ int BM_Boundary_Edge(BMEdge *e)
  *
  *  Counts the number of edges two faces share (if any)
  *
- *  TODO:
+ *  BMESH_TODO:
  *    Move this to structure, and wrap.
  * 
  *  Returns -
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c
index 09b6fba80a9..232c2e75dde 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -148,7 +148,7 @@ void *BMW_Step(BMWalker *walker)
  *
  * Steps a mesh walker forward by one element
  *
- * TODO:
+ * BMESH_TODO:
  *  -add searchmask filtering
  *
 */
diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c
index e537fbf5f6a..fd730e32757 100644
--- a/source/blender/bmesh/operators/subdivideop.c
+++ b/source/blender/bmesh/operators/subdivideop.c
@@ -269,7 +269,7 @@ static BMVert *bm_subdivide_edge_addvert(BMesh *bm, BMEdge *edge,BMEdge *oedge,
 	/* offset for smooth or sphere or fractal */
 	alter_co(bm, ev, oedge, params, percent2, vsta, vend);
 
-#if 0 //TODO
+#if 0 //BMESH_TODO
 	/* clip if needed by mirror modifier */
 	if (edge->v1->f2) {
 		if ( edge->v1->f2 & edge->v2->f2 & 1) {
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 33f7c3caac1..10020136b27 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -3040,7 +3040,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "add", 1, "Add", "Add rather then blend between shapes.");
 }
 
-/* TODO - some way to select on an arbitrary axis */
+/* BMESH_TODO - some way to select on an arbitrary axis */
 static int select_axis_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index d44fc379fda..e47bcc3dec1 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1378,7 +1378,7 @@ static void rna_def_mtexpoly(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "UV Selected", "");
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
 
-#if 0
+#if 0 /*BMESH_TODO*/
 	prop= RNA_def_property(srna, "pin_uv", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1);
 	RNA_def_property_array(prop, 4);