[Bf-blender-cvs] [28a08e7] master: Cleanup: BMesh arg name

Campbell Barton noreply at git.blender.org
Fri Aug 22 08:17:45 CEST 2014


Commit: 28a08e7ae641cb05ddfcc39c4d9e9f2fc8ce20aa
Author: Campbell Barton
Date:   Fri Aug 22 16:16:19 2014 +1000
Branches: master
https://developer.blender.org/rB28a08e7ae641cb05ddfcc39c4d9e9f2fc8ce20aa

Cleanup: BMesh arg name

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

M	source/blender/bmesh/intern/bmesh_interp.h
M	source/blender/bmesh/intern/bmesh_marking.h
M	source/blender/bmesh/intern/bmesh_mesh.h
M	source/blender/editors/include/ED_mesh.h

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

diff --git a/source/blender/bmesh/intern/bmesh_interp.h b/source/blender/bmesh/intern/bmesh_interp.h
index 2a3b519..c605ad3 100644
--- a/source/blender/bmesh/intern/bmesh_interp.h
+++ b/source/blender/bmesh/intern/bmesh_interp.h
@@ -33,9 +33,9 @@ void  BM_vert_interp_from_face(BMesh *bm, BMVert *v, BMFace *source);
 void  BM_data_interp_from_verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, const float fac);
 void  BM_data_interp_from_edges(BMesh *bm, BMEdge *e1, BMEdge *e2, BMEdge *e, const float fac);
 void  BM_data_interp_face_vert_edge(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, BMEdge *e1, const float fac);
-void  BM_data_layer_add(BMesh *em, CustomData *data, int type);
+void  BM_data_layer_add(BMesh *bm, CustomData *data, int type);
 void  BM_data_layer_add_named(BMesh *bm, CustomData *data, int type, const char *name);
-void  BM_data_layer_free(BMesh *em, CustomData *data, int type);
+void  BM_data_layer_free(BMesh *bm, CustomData *data, int type);
 void  BM_data_layer_free_n(BMesh *bm, CustomData *data, int type, int n);
 void  BM_data_layer_copy(BMesh *bm, CustomData *data, int type, int src_n, int dst_n);
 
diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h
index 99456ea..655ace6 100644
--- a/source/blender/bmesh/intern/bmesh_marking.h
+++ b/source/blender/bmesh/intern/bmesh_marking.h
@@ -98,7 +98,7 @@ void _bm_select_history_store_after(BMesh *bm,  BMEditSelection *ese_ref, BMHead
 void _bm_select_history_store_after_notest(BMesh *bm,  BMEditSelection *ese_ref, BMHeader *ele);
 
 void BM_select_history_validate(BMesh *bm);
-void BM_select_history_clear(BMesh *em);
+void BM_select_history_clear(BMesh *bm);
 bool BM_select_history_active_get(BMesh *bm, struct BMEditSelection *ese);
 
 #endif /* __BMESH_MARKING_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index da181df..22e5050 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -50,7 +50,7 @@ void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char *fu
                                  const char *msg_a, const char *msg_b);
 
 #ifndef NDEBUG
-bool BM_mesh_elem_table_check(BMesh *em);
+bool BM_mesh_elem_table_check(BMesh *bm);
 #endif
 
 void           BM_mesh_elem_table_ensure(BMesh *bm, const char htype);
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index ebc97c5..4acc527 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -119,7 +119,7 @@ void EDBM_mesh_reveal(struct BMEditMesh *em);
 
 void EDBM_update_generic(struct BMEditMesh *em, const bool do_tessface, const bool is_destructive);
 
-struct UvElementMap *BM_uv_element_map_create(struct BMesh *em, const bool selected, const bool do_islands);
+struct UvElementMap *BM_uv_element_map_create(struct BMesh *bm, const bool selected, const bool do_islands);
 void                 BM_uv_element_map_free(struct UvElementMap *vmap);
 struct UvElement    *BM_uv_element_get(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l);




More information about the Bf-blender-cvs mailing list