blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-04-29 17:21:28 +10:00
parent 737a1a85b4 7a475a89eb
commit 816fc5a308
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/mesh/editmesh_select_similar.c
View File

@ -1325,7 +1325,9 @@ void MESH_OT_select_similar(wmOperatorType *ot)
RNA_def_enum(ot->srna, "compare", prop_similar_compare_types, SIM_CMP_EQ, "Compare", "");
RNA_def_float(ot->srna, "threshold", 0.0f, 0.0f, 1.0f, "Threshold", "", 0.0f, 1.0f);
prop = RNA_def_float(ot->srna, "threshold", 0.0f, 0.0f, 1.0f, "Threshold", "", 0.0f, 1.0f);
/* Very small values are needed sometimes, similar area of small faces for e.g: see T87823 */
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 5);
}
/** \} */

6
source/blender/editors/util/select_utils.c
View File

@ -88,11 +88,11 @@ int ED_select_similar_compare_float(const float delta, const float thresh, const
{
switch (compare) {
case SIM_CMP_EQ:
return (fabsf(delta) < thresh + FLT_EPSILON);
return (fabsf(delta) <= thresh);
case SIM_CMP_GT:
return ((delta + thresh) > -FLT_EPSILON);
return ((delta + thresh) >= 0.0);
case SIM_CMP_LT:
return ((delta - thresh) < FLT_EPSILON);
return ((delta - thresh) <= 0.0);
default:
BLI_assert_unreachable();
return 0;