[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44068] branches/bmesh/blender/source/ blender/editors: remove bm_get_cd_float, use CustomData_bmesh_get instead, this function only casts to a float, and doesnt simplify args.

[Campbell Barton]

Revision: 44068
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44068
Author:   campbellbarton
Date:     2012-02-12 18:49:56 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
remove bm_get_cd_float, use CustomData_bmesh_get instead, this function only casts to a float, and doesnt simplify args.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c

Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2012-02-12 18:43:59 UTC (rev 44067)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2012-02-12 18:49:56 UTC (rev 44068)
@@ -97,8 +97,6 @@
 #define B_FRACTAL		0x2000
 #define B_SPHERE		0x4000
 
-float *bm_get_cd_float(struct CustomData *cdata, void *data, int type);
-
 intptr_t    mesh_octree_table(struct Object *ob, struct BMEditMesh *em, float *co, char mode);
 int         mesh_mirrtopo_table(struct Object *ob, char mode);
 

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-12 18:43:59 UTC (rev 44067)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-12 18:49:56 UTC (rev 44068)
@@ -1296,13 +1296,6 @@
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-float *bm_get_cd_float(CustomData *cdata, void *data, int type)
-{
-	float *f = CustomData_bmesh_get(cdata, data, type);
-
-	return f;
-}
-
 static const EnumPropertyItem direction_items[] = {
 	{DIRECTION_CW, "CW", 0, "Clockwise", ""},
 	{DIRECTION_CCW, "CCW", 0, "Counter Clockwise", ""},

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-12 18:43:59 UTC (rev 44067)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-12 18:49:56 UTC (rev 44068)
@@ -2531,7 +2531,7 @@
 {
 	BMEditMesh *em = userData;
 	BMEdge *eed = EDBM_get_edge_for_index(userData, index);
-	float *crease = eed ? bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE) : NULL;
+	float *crease = eed ? (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE) : NULL;
 	
 	if (!crease)
 		return 0;
@@ -2554,7 +2554,7 @@
 {
 	BMEditMesh *em = userData;
 	BMEdge *eed = EDBM_get_edge_for_index(userData, index);
-	float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT);
+	float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 
 	if (!bweight)
 		return 0;
@@ -2570,7 +2570,7 @@
 {
 	BMEditMesh *em = userData;
 	BMVert *eve = EDBM_get_vert_for_index(userData, index);
-	float *bweight = bm_get_cd_float(&em->bm->vdata, eve->head.data, CD_BWEIGHT);
+	float *bweight = (float *)CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_BWEIGHT);
 	
 	if (!bweight)
 		return;

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c	2012-02-12 18:43:59 UTC (rev 44067)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c	2012-02-12 18:49:56 UTC (rev 44068)
@@ -173,10 +173,10 @@
 				float *f;
 
 				totedge++;
-				f = bm_get_cd_float(&bm->edata, eed->head.data, CD_CREASE);
+				f = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
 				median[3]+= f ? *f : 0.0f;
 
-				f = bm_get_cd_float(&bm->edata, eed->head.data, CD_BWEIGHT);
+				f = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
 				median[6]+= f ? *f : 0.0f;
 			}
 		}
@@ -436,7 +436,7 @@
 
 					BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 						if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-							float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE);
+							float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE);
 							if (!crease) break;
 							
 							*crease= fixed_crease;
@@ -458,7 +458,7 @@
 						
 						BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 							if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-								float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE);
+								float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE);
 								
 								if (!crease) break;
 								
@@ -473,7 +473,7 @@
 
 						BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 							if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-								float *crease = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE);
+								float *crease = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE);
 								if (!crease) break;
 
 								*crease = 1.0f - ((1.0f - *crease) * sca);
@@ -493,7 +493,7 @@
 
 					BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 						if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
-							float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT);
+							float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 							if(!bweight) break;
 							
 							*bweight = fixed_bweight;
@@ -515,7 +515,7 @@
 						
 						BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 							if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-								float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT);
+								float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 								if(!bweight) break;
 								
 								*bweight *= sca;
@@ -529,7 +529,7 @@
 
 						BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 							if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-								float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT);
+								float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 								if(!bweight) break;
 
 								*bweight = 1.0f - ((1.0f - *bweight) * sca);