[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48650] branches/soc-2012-sushi/source/ blender: Style cleanup: Rename bmesh ops.

Alexander Pinzon apinzonf at gmail.com
Thu Jul 5 16:33:29 CEST 2012


Revision: 48650
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48650
Author:   apinzonf
Date:     2012-07-05 14:33:29 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Style cleanup: Rename bmesh ops.

Modified Paths:
--------------
    branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c

Modified: branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_opdefines.c	2012-07-05 14:30:35 UTC (rev 48649)
+++ branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_opdefines.c	2012-07-05 14:33:29 UTC (rev 48650)
@@ -115,8 +115,8 @@
  * Smooths vertices by using Laplacian smoothing propose by.
  * Desbrun, et al. Implicit Fairing of Irregular Meshes using Diffusion and Curvature Flow
 */
-static BMOpDefine bmo_vertexsmoothlaplacian_def = {
-	"vertexsmoothlaplacian",
+static BMOpDefine bmo_smooth_laplacian_vert_def = {
+	"smooth_laplacian_vert",
 	{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
 	 {BMO_OP_SLOT_FLT, "lambda"}, //lambda param
 	 {BMO_OP_SLOT_FLT, "lambda_border"}, //lambda param in border
@@ -127,7 +127,7 @@
 	 {BMO_OP_SLOT_MAPPING, "vertex_group"}, // Vertex group with weights for every vertice.
 	{0} /* null-terminating sentinel */,
 	},
-	bmo_vertexsmoothlaplacian_exec,
+	bmo_smooth_laplacian_vert_exec,
 	0
 };
 
@@ -1264,7 +1264,7 @@
 	&bmo_translate_def,
 	&bmo_triangle_fill_def,
 	&bmo_triangulate_def,
-	&bmo_vertexsmoothlaplacian_def,
+	&bmo_smooth_laplacian_vert_def,
 	&bmo_weld_verts_def,
 	&bmo_wireframe_def,
 

Modified: branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operators_private.h
===================================================================
--- branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operators_private.h	2012-07-05 14:30:35 UTC (rev 48649)
+++ branches/soc-2012-sushi/source/blender/bmesh/intern/bmesh_operators_private.h	2012-07-05 14:33:29 UTC (rev 48650)
@@ -60,10 +60,13 @@
 void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op);
 void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op);
 void bmo_duplicate_exec(BMesh *bm, BMOperator *op);
+void bmo_edgebisect_exec(BMesh *bm, BMOperator *op);
 void bmo_edgenet_fill_exec(BMesh *bm, BMOperator *op);
 void bmo_edgenet_prepare(BMesh *bm, BMOperator *op);
+void bmo_edgerotate_exec(BMesh *bm, BMOperator *op);
 void bmo_extrude_discrete_faces_exec(BMesh *bm, BMOperator *op);
 void bmo_extrude_edge_only_exec(BMesh *bm, BMOperator *op);
+void bmo_extrude_face_indiv_exec(BMesh *bm, BMOperator *op);
 void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op);
 void bmo_extrude_vert_indiv_exec(BMesh *bm, BMOperator *op);
 void bmo_find_doubles_exec(BMesh *bm, BMOperator *op);
@@ -72,16 +75,6 @@
 void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op);
 void bmo_mirror_exec(BMesh *bm, BMOperator *op);
 void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op);
-void bmo_edgebisect_exec(BMesh *bm, BMOperator *op);
-void bmo_reversefaces_exec(BMesh *bm, BMOperator *op);
-void bmo_edgerotate_exec(BMesh *bm, BMOperator *op);
-void bmo_regionextend_exec(BMesh *bm, BMOperator *op);
-void bmo_righthandfaces_exec(BMesh *bm, BMOperator *op);
-void bmo_vertexsmooth_exec(BMesh *bm, BMOperator *op);
-void bmo_vertexsmoothlaplacian_exec(BMesh *bm, BMOperator *op);
-void bmo_extrude_edge_only_exec(BMesh *bm, BMOperator *op);
-void bmo_extrude_face_indiv_exec(BMesh *bm, BMOperator *op);
-void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op);
 void bmo_pointmerge_exec(BMesh *bm, BMOperator *op);
 void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op);
 void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op);
@@ -101,6 +94,7 @@
 void bmo_similar_verts_exec(BMesh *bm, BMOperator *op);
 void bmo_slide_vert_exec(BMesh *bm, BMOperator *op);
 void bmo_smooth_vert_exec(BMesh *bm, BMOperator *op);
+void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op);
 void bmo_solidify_face_region_exec(BMesh *bm, BMOperator *op);
 void bmo_spin_exec(BMesh *bm, BMOperator *op);
 void bmo_split_edges_exec(BMesh *bm, BMOperator *op);

Modified: branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_smooth_laplacian.c	2012-07-05 14:30:35 UTC (rev 48649)
+++ branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_smooth_laplacian.c	2012-07-05 14:33:29 UTC (rev 48650)
@@ -472,7 +472,7 @@
 	}
 }
 
-void bmo_vertexsmoothlaplacian_exec(BMesh *bm, BMOperator *op)
+void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op)
 {
 	int i;
 	int m_vertex_id;

Modified: branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-07-05 14:30:35 UTC (rev 48649)
+++ branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-07-05 14:33:29 UTC (rev 48650)
@@ -1635,7 +1635,7 @@
 	
 	for (i = 0; i < repeat; i++) {
 		if (!EDBM_op_callf(em, op,
-		                   "vertexsmoothlaplacian verts=%hv lambda=%f lambda_border=%f min_area=%f use_x=%b use_y=%b use_z=%b",
+		                   "smooth_laplacian_vert verts=%hv lambda=%f lambda_border=%f min_area=%f use_x=%b use_y=%b use_z=%b",
 		                   BM_ELEM_SELECT, lambda, lambda_border, min_area, usex, usey, usez))
 		{
 			return OPERATOR_CANCELLED;




More information about the Bf-blender-cvs mailing list