diff options
author | Matt Ebb <matt@mke3.net> | 2010-12-15 03:56:15 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-12-15 03:56:15 +0300 |
commit | f2d843ed2be8dd8ffdd3c8958f682f9411fdf50d (patch) | |
tree | 663e9d5cc0bb08d0e25de6dc60f079a240a0a785 /source/blender/editors/mesh | |
parent | 100d611ce53f759508b29c819b0033cbf8bbb167 (diff) |
Exposed mesh edit 'select similar' threshold as operator property, must have been missed before.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index b4cac123ce4..d017ddb1b3e 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -731,7 +731,7 @@ static EnumPropertyItem prop_similar_types[] = { *0.5 so smaller faces arnt ALWAYS selected with a thresh of 1.0 */ #define SCALE_CMP(a,b) ((a+a*thresh >= b) && (a-(a*thresh*0.5) <= b)) -static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode) +static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode, float thresh) { EditFace *efa, *base_efa=NULL; unsigned int selcount=0; /*count how many new faces we select*/ @@ -739,7 +739,6 @@ static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode) /*deselcount, count how many deselected faces are left, so we can bail out early also means that if there are no deselected faces, we can avoid a lot of looping */ unsigned int deselcount=0; - float thresh= scene->toolsettings->select_thresh; short ok=0; for(efa= em->faces.first; efa; efa= efa->next) { @@ -864,7 +863,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) Mesh *me= obedit->data; EditMesh *em= BKE_mesh_get_editmesh(me); - int selcount = similar_face_select__internal(scene, em, RNA_int_get(op->ptr, "type")); + int selcount = similar_face_select__internal(scene, em, RNA_int_get(op->ptr, "type"), RNA_float_get(op->ptr, "threshold")); if (selcount) { /* here was an edge-mode only select flush case, has to be generalized */ @@ -880,7 +879,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) /* ***************************************************** */ -static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mode) +static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mode, float thresh) { EditEdge *eed, *base_eed=NULL; unsigned int selcount=0; /* count how many new edges we select*/ @@ -890,7 +889,6 @@ static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mod unsigned int deselcount=0; short ok=0; - float thresh= ts->select_thresh; for(eed= em->edges.first; eed; eed= eed->next) { if (!eed->h) { @@ -1085,7 +1083,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) Mesh *me= obedit->data; EditMesh *em= BKE_mesh_get_editmesh(me); - int selcount = similar_edge_select__internal(ts, em, RNA_int_get(op->ptr, "type")); + int selcount = similar_edge_select__internal(ts, em, RNA_int_get(op->ptr, "type"), RNA_float_get(op->ptr, "threshold")); if (selcount) { /* here was an edge-mode only select flush case, has to be generalized */ @@ -1114,9 +1112,9 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) so we can return when there are none left */ unsigned int deselcount=0; int mode= RNA_enum_get(op->ptr, "type"); + float thresh = RNA_float_get(op->ptr, "threshold"); short ok=0; - float thresh= ts->select_thresh; for(eve= em->verts.first; eve; eve= eve->next) { if (!eve->h) { @@ -1304,6 +1302,7 @@ void MESH_OT_select_similar(wmOperatorType *ot) prop= RNA_def_enum(ot->srna, "type", prop_similar_types, SIMVERT_NORMAL, "Type", ""); RNA_def_enum_funcs(prop, select_similar_type_itemf); ot->prop= prop; + RNA_def_float(ot->srna, "threshold", 0.01f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 100.f); } /* ******************************************* */ |