Revision: 48447
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48447
Author: campbellbarton
Date: 2012-06-30 15:27:13 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
rename bmesh ops since they are exposed in an api now.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators_private.h
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_slide.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_skin.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-06-30
14:53:58 UTC (rev 48446)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-06-30
15:27:13 UTC (rev 48447)
@@ -318,10 +318,10 @@
return;
}
- BMO_op_initf(bm, &bmop, "righthandfaces faces=%af do_flip=%b", FALSE);
+ BMO_op_initf(bm, &bmop, "recalc_face_normals faces=%af do_flip=%b",
FALSE);
BMO_push(bm, &bmop);
- bmo_righthandfaces_exec(bm, &bmop);
+ bmo_recalc_face_normals_exec(bm, &bmop);
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
BM_elem_flag_set(f, BM_ELEM_TAG, BMO_elem_flag_test(bm, f,
FACE_FLIP));
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-06-30
14:53:58 UTC (rev 48446)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-06-30
15:27:13 UTC (rev 48447)
@@ -97,8 +97,8 @@
*
* Smooths vertices by using a basic vertex averaging scheme.
*/
-static BMOpDefine bmo_vertexsmooth_def = {
- "vertexsmooth",
+static BMOpDefine bmo_smooth_vert_def = {
+ "smooth_vert",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
{BMO_OP_SLOT_BOOL, "mirror_clip_x"}, //set vertices close to the x
axis before the operation to 0
{BMO_OP_SLOT_BOOL, "mirror_clip_y"}, //set vertices close to the y
axis before the operation to 0
@@ -106,7 +106,7 @@
{BMO_OP_SLOT_FLT, "clipdist"}, //clipping threshod for the above three
slots
{0} /* null-terminating sentinel */,
},
- bmo_vertexsmooth_exec,
+ bmo_smooth_vert_exec,
0
};
@@ -116,13 +116,13 @@
* Computes an "outside" normal for the specified input faces.
*/
-static BMOpDefine bmo_righthandfaces_def = {
- "righthandfaces",
+static BMOpDefine bmo_recalc_face_normals_def = {
+ "recalc_face_normals",
{{BMO_OP_SLOT_ELEMENT_BUF, "faces"},
{BMO_OP_SLOT_BOOL, "do_flip"}, //internal flag, used by
bmesh_rationalize_normals
{0} /* null-terminating sentinel */,
},
- bmo_righthandfaces_exec,
+ bmo_recalc_face_normals_exec,
BMO_OP_FLAG_UNTAN_MULTIRES,
};
@@ -136,15 +136,15 @@
* if usefaces is 0 then geomout spits out verts and edges,
* otherwise it spits out faces.
*/
-static BMOpDefine bmo_regionextend_def = {
- "regionextend",
+static BMOpDefine bmo_region_extend_def = {
+ "region_extend",
{{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, //input geometry
{BMO_OP_SLOT_ELEMENT_BUF, "geomout"}, //output slot, computed boundary
geometry.
{BMO_OP_SLOT_BOOL, "constrict"}, //find boundary inside the regions,
not outside.
{BMO_OP_SLOT_BOOL, "use_faces"}, //extend from faces instead of edges
{0} /* null-terminating sentinel */,
},
- bmo_regionextend_exec,
+ bmo_region_extend_exec,
0
};
@@ -154,14 +154,14 @@
* Rotates edges topologically. Also known as "spin edge" to some people.
* Simple example: [/] becomes [|] then [\].
*/
-static BMOpDefine bmo_edgerotate_def = {
- "edgerotate",
+static BMOpDefine bmo_rotate_edges_def = {
+ "rotate_edges",
{{BMO_OP_SLOT_ELEMENT_BUF, "edges"}, //input edges
{BMO_OP_SLOT_ELEMENT_BUF, "edgeout"}, //newly spun edges
{BMO_OP_SLOT_BOOL, "ccw"}, //rotate edge counter-clockwise if true,
othewise clockwise
{0} /* null-terminating sentinel */,
},
- bmo_edgerotate_exec,
+ bmo_rotate_edges_exec,
BMO_OP_FLAG_UNTAN_MULTIRES
};
@@ -171,12 +171,12 @@
* Reverses the winding (vertex order) of faces. This has the effect of
* flipping the normal.
*/
-static BMOpDefine bmo_reversefaces_def = {
- "reversefaces",
+static BMOpDefine bmo_reverse_faces_def = {
+ "reverse_faces",
{{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, //input faces
{0} /* null-terminating sentinel */,
},
- bmo_reversefaces_exec,
+ bmo_reverse_faces_exec,
BMO_OP_FLAG_UNTAN_MULTIRES,
};
@@ -186,14 +186,14 @@
* Splits input edges (but doesn't do anything else).
* This creates a 2-valence vert.
*/
-static BMOpDefine bmo_edgebisect_def = {
- "edgebisect",
+static BMOpDefine bmo_bisect_edges_def = {
+ "bisect_edges",
{{BMO_OP_SLOT_ELEMENT_BUF, "edges"}, //input edges
{BMO_OP_SLOT_INT, "numcuts"}, //number of cuts
{BMO_OP_SLOT_ELEMENT_BUF, "outsplit"}, //newly created vertices and
edges
{0} /* null-terminating sentinel */,
},
- bmo_edgebisect_exec,
+ bmo_bisect_edges_exec,
BMO_OP_FLAG_UNTAN_MULTIRES
};
@@ -225,17 +225,17 @@
* Takes input verts and find vertices they should weld to. Outputs a
* mapping slot suitable for use with the weld verts bmop.
*
- * If keepverts is used, vertices outside that set can only be merged
+ * If keep_verts is used, vertices outside that set can only be merged
* with vertices in that set.
*/
-static BMOpDefine bmo_finddoubles_def = {
- "finddoubles",
+static BMOpDefine bmo_find_doubles_def = {
+ "find_doubles",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
- {BMO_OP_SLOT_ELEMENT_BUF, "keepverts"}, //list of verts to keep
+ {BMO_OP_SLOT_ELEMENT_BUF, "keep_verts"}, //list of verts to keep
{BMO_OP_SLOT_FLT, "dist"}, //minimum distance
{BMO_OP_SLOT_MAPPING, "targetmapout"},
{0, /* null-terminating sentinel */}},
- bmo_finddoubles_exec,
+ bmo_find_doubles_exec,
0,
};
@@ -305,11 +305,11 @@
* the bounding box center. (I know, it's not averaging but
* the vert_snap_to_bb_center is just too long).
*/
-static BMOpDefine bmo_vert_average_facedata_def = {
- "vert_average_facedata",
+static BMOpDefine bmo_average_vert_facedata_def = {
+ "average_vert_facedata",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, /* input vertice */
{0, /* null-terminating sentinel */}},
- bmo_vert_average_facedata_exec,
+ bmo_average_vert_facedata_exec,
0,
};
@@ -321,7 +321,7 @@
static BMOpDefine bmo_pointmerge_def = {
"pointmerge",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, /* input vertice */
- {BMO_OP_SLOT_VEC, "mergeco"},
+ {BMO_OP_SLOT_VEC, "merge_co"},
{0, /* null-terminating sentinel */}},
bmo_pointmerge_exec,
BMO_OP_FLAG_UNTAN_MULTIRES,
@@ -347,11 +347,11 @@
* use or will use this bmop). You pass in mappings from vertices to the
vertices
* they weld with.
*/
-static BMOpDefine bmo_weldverts_def = {
- "weldverts",
+static BMOpDefine bmo_weld_verts_def = {
+ "weld_verts",
{{BMO_OP_SLOT_MAPPING, "targetmap"}, /* maps welded vertices to verts
they should weld to */
{0, /* null-terminating sentinel */}},
- bmo_weldverts_exec,
+ bmo_weld_verts_exec,
BMO_OP_FLAG_UNTAN_MULTIRES,
};
@@ -361,12 +361,12 @@
* Creates a single vertex; this bmop was necessary
* for click-create-vertex.
*/
-static BMOpDefine bmo_makevert_def = {
- "makevert",
+static BMOpDefine bmo_create_vert_def = {
+ "create_vert",
{{BMO_OP_SLOT_VEC, "co"}, //the coordinate of the new vert
{BMO_OP_SLOT_ELEMENT_BUF, "newvertout"}, //the new vert
{0, /* null-terminating sentinel */}},
- bmo_makevert_exec,
+ bmo_create_vert_exec,
0,
};
@@ -572,13 +572,13 @@
*
* Extrudes faces individually.
*/
-static BMOpDefine bmo_extrude_indivface_def = {
- "extrude_face_indiv",
+static BMOpDefine bmo_extrude_discrete_faces_def = {
+ "extrude_discrete_faces",
{{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, //input faces
{BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, //output faces
{BMO_OP_SLOT_ELEMENT_BUF, "skirtout"}, //output skirt geometry, faces
and edges
{0} /* null-terminating sentinel */},
- bmo_extrude_face_indiv_exec,
+ bmo_extrude_discrete_faces_exec,
0
};
@@ -612,12 +612,12 @@
0
};
-static BMOpDefine bmo_connectverts_def = {
- "connectverts",
+static BMOpDefine bmo_connect_verts_def = {
+ "connect_verts",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"},
{BMO_OP_SLOT_ELEMENT_BUF, "edgeout"},
{0} /* null-terminating sentinel */},
- bmo_connectverts_exec,
+ bmo_connect_verts_exec,
BMO_OP_FLAG_UNTAN_MULTIRES
};
@@ -691,8 +691,8 @@
BMO_OP_FLAG_UNTAN_MULTIRES
};
-static BMOpDefine bmo_esubd_def = {
- "esubd",
+static BMOpDefine bmo_subdivide_edges_def = {
+ "subdivide_edges",
{{BMO_OP_SLOT_ELEMENT_BUF, "edges"},
{BMO_OP_SLOT_FLT, "smooth"},
{BMO_OP_SLOT_FLT, "fractal"},
@@ -714,21 +714,21 @@
{0} /* null-terminating sentinel */,
},
- bmo_esubd_exec,
+ bmo_subdivide_edges_exec,
BMO_OP_FLAG_UNTAN_MULTIRES
};
-static BMOpDefine bmo_del_def = {
- "del",
+static BMOpDefine bmo_delete_def = {
+ "delete",
{{BMO_OP_SLOT_ELEMENT_BUF, "geom"},
{BMO_OP_SLOT_INT, "context"},
{0} /* null-terminating sentinel */},
- bmo_del_exec,
+ bmo_delete_exec,
0
};
-static BMOpDefine bmo_dupe_def = {
- "dupe",
+static BMOpDefine bmo_duplicate_def = {
+ "duplicate",
{{BMO_OP_SLOT_ELEMENT_BUF, "geom"},
{BMO_OP_SLOT_ELEMENT_BUF, "origout"},
{BMO_OP_SLOT_ELEMENT_BUF, "newout"},
@@ -739,7 +739,7 @@
{BMO_OP_SLOT_MAPPING, "isovertmap"},
{BMO_OP_SLOT_PNT, "dest"}, /* destination bmesh, if NULL will use
current on */
{0} /* null-terminating sentinel */},
- bmo_dupe_exec,
+ bmo_duplicate_exec,
0
};
@@ -783,14 +783,14 @@
*
* Find similar faces (area/material/perimeter, ...).
*/
-static BMOpDefine bmo_similarfaces_def = {
- "similarfaces",
+static BMOpDefine bmo_similar_faces_def = {
+ "similar_faces",
{{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, /* input faces */
{BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, /* output faces */
{BMO_OP_SLOT_INT, "type"}, /* type of selection */
{BMO_OP_SLOT_FLT, "thresh"}, /* threshold of selection */
{0} /* null-terminating sentinel */},
- bmo_similarfaces_exec,
+ bmo_similar_faces_exec,
0
};
@@ -799,14 +799,14 @@
*
* Find similar edges (length, direction, edge, seam, ...).
*/
-static BMOpDefine bmo_similaredges_def = {
- "similaredges",
+static BMOpDefine bmo_similar_edges_def = {
+ "similar_edges",
{{BMO_OP_SLOT_ELEMENT_BUF, "edges"}, /* input edges */
{BMO_OP_SLOT_ELEMENT_BUF, "edgeout"}, /* output edges */
{BMO_OP_SLOT_INT, "type"}, /* type of selection */
{BMO_OP_SLOT_FLT, "thresh"}, /* threshold of selection */
{0} /* null-terminating sentinel */},
- bmo_similaredges_exec,
+ bmo_similar_edges_exec,
0
};
@@ -815,14 +815,14 @@
*
* Find similar vertices (normal, face, vertex group, ...).
*/
-static BMOpDefine bmo_similarverts_def = {
- "similarverts",
+static BMOpDefine bmo_similar_verts_def = {
+ "similar_verts",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, /* input vertices */
{BMO_OP_SLOT_ELEMENT_BUF, "vertout"}, /* output vertices */
{BMO_OP_SLOT_INT, "type"}, /* type of selection */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
