Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-09-28 16:32:04 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-09-28 16:32:04 +0300
commit0f03750f4fb0bee3bdd889b07f37de07243d21f7 (patch)
treefe9a7d3ece788e090171bbf7e9c4e955b94ad0a8 /source/blender/bmesh/intern
parent75b2091d42535d8815d5cd59812a2e793b6dca2c (diff)
Cleanup: Remove bmo_similar.c and small renaming
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r--source/blender/bmesh/intern/bmesh_opdefines.c114
-rw-r--r--source/blender/bmesh/intern/bmesh_operators.h6
-rw-r--r--source/blender/bmesh/intern/bmesh_operators_private.h3
3 files changed, 0 insertions, 123 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index d1366d24b5b..778ca89d70c 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -116,13 +116,6 @@ static BMO_FlagSet bmo_enum_falloff_type[] = {
{0, NULL},
};
-static BMO_FlagSet bmo_enum_compare_types[] = {
- {SIM_CMP_EQ, "EQUAL"},
- {SIM_CMP_GT, "GREATER_THAN"},
- {SIM_CMP_LT, "LESS_THAN"},
- {0, NULL},
-};
-
/*
* Vertex Smooth.
*
@@ -1479,110 +1472,6 @@ static BMOpDefine bmo_spin_def = {
BMO_OPTYPE_FLAG_SELECT_FLUSH),
};
-static BMO_FlagSet bmo_enum_similar_faces_types[] = {
- {SIMFACE_MATERIAL, "MATERIAL"},
- {SIMFACE_AREA, "AREA"},
- {SIMFACE_SIDES, "SIDES"},
- {SIMFACE_PERIMETER, "PERIMETER"},
- {SIMFACE_NORMAL, "NORMAL"},
- {SIMFACE_COPLANAR, "COPLANAR"},
- {SIMFACE_SMOOTH, "SMOOTH"},
- {SIMFACE_FACEMAP, "FACE_MAP"},
-#ifdef WITH_FREESTYLE
- {SIMFACE_FREESTYLE, "FREESTYLE"},
-#endif
- {0, NULL},
-};
-
-/*
- * Similar Faces Search.
- *
- * Find similar faces (area/material/perimeter, ...).
- */
-static BMOpDefine bmo_similar_faces_def = {
- "similar_faces",
- /* slots_in */
- {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */
- {"type", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_similar_faces_types}, /* type of selection */
- {"thresh", BMO_OP_SLOT_FLT}, /* threshold of selection */
- {"compare", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_compare_types}, /* comparison method */
- {{'\0'}},
- },
- /* slots_out */
- {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */
- {{'\0'}},
- },
- bmo_similar_faces_exec,
- (BMO_OPTYPE_FLAG_SELECT_FLUSH),
-};
-
-static BMO_FlagSet bmo_enum_similar_edges_types[] = {
- {SIMEDGE_LENGTH, "LENGTH"},
- {SIMEDGE_DIR, "DIRECTION"},
- {SIMEDGE_FACE, "FACE"},
- {SIMEDGE_FACE_ANGLE, "FACE_ANGLE"},
- {SIMEDGE_CREASE, "CREASE"},
- {SIMEDGE_BEVEL, "BEVEL"},
- {SIMEDGE_SEAM, "SEAM"},
- {SIMEDGE_SHARP, "SHARP"},
-#ifdef WITH_FREESTYLE
- {SIMEDGE_FREESTYLE, "FREESTYLE"},
-#endif
- {0, NULL},
-};
-
-/*
- * Similar Edges Search.
- *
- * Find similar edges (length, direction, edge, seam, ...).
- */
-static BMOpDefine bmo_similar_edges_def = {
- "similar_edges",
- /* slots_in */
- {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
- {"type", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_similar_edges_types}, /* type of selection */
- {"thresh", BMO_OP_SLOT_FLT}, /* threshold of selection */
- {"compare", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_compare_types}, /* comparison method */
- {{'\0'}},
- },
- /* slots_out */
- {{"edges.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* output edges */
- {{'\0'}},
- },
- bmo_similar_edges_exec,
- (BMO_OPTYPE_FLAG_SELECT_FLUSH),
-};
-
-static BMO_FlagSet bmo_enum_similar_verts_types[] = {
- {SIMVERT_NORMAL, "NORMAL"},
- {SIMVERT_FACE, "FACE"},
- {SIMVERT_VGROUP, "VERTEX_GROUP"},
- {SIMVERT_EDGE, "EDGE"},
- {0, NULL},
-};
-
-/*
- * Similar Verts Search.
- *
- * Find similar vertices (normal, face, vertex group, ...).
- */
-static BMOpDefine bmo_similar_verts_def = {
- "similar_verts",
- /* slots_in */
- {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */
- {"type", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_similar_verts_types}, /* type of selection */
- {"thresh", BMO_OP_SLOT_FLT}, /* threshold of selection */
- {"compare", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, bmo_enum_compare_types}, /* comparison method */
- {{'\0'}},
- },
- /* slots_out */
- {{"verts.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* output vertices */
- {{'\0'}},
- },
- bmo_similar_verts_exec,
- (BMO_OPTYPE_FLAG_SELECT_FLUSH),
-};
-
/*
* UV Rotation.
*
@@ -2236,9 +2125,6 @@ const BMOpDefine *bmo_opdefines[] = {
&bmo_rotate_edges_def,
&bmo_rotate_uvs_def,
&bmo_scale_def,
- &bmo_similar_edges_def,
- &bmo_similar_faces_def,
- &bmo_similar_verts_def,
&bmo_smooth_vert_def,
&bmo_smooth_laplacian_vert_def,
&bmo_solidify_def,
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h
index d8f995b9d3e..3e96d5ff44a 100644
--- a/source/blender/bmesh/intern/bmesh_operators.h
+++ b/source/blender/bmesh/intern/bmesh_operators.h
@@ -56,12 +56,6 @@ enum {
SUBDIV_SELECT_LOOPCUT
};
-enum {
- SIM_CMP_EQ = 0,
- SIM_CMP_GT,
- SIM_CMP_LT
-};
-
/* subdivide_edgering */
enum {
/* just subdiv */
diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h
index 5548ee7c361..8e9edfac1f9 100644
--- a/source/blender/bmesh/intern/bmesh_operators_private.h
+++ b/source/blender/bmesh/intern/bmesh_operators_private.h
@@ -94,9 +94,6 @@ void bmo_rotate_edges_exec(BMesh *bm, BMOperator *op);
void bmo_rotate_exec(BMesh *bm, BMOperator *op);
void bmo_rotate_uvs_exec(BMesh *bm, BMOperator *op);
void bmo_scale_exec(BMesh *bm, BMOperator *op);
-void bmo_similar_edges_exec(BMesh *bm, BMOperator *op);
-void bmo_similar_faces_exec(BMesh *bm, BMOperator *op);
-void bmo_similar_verts_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);