[Bf-blender-cvs] [c5d3abc] master: Bevel fix to clamping for percent type.

Howard Trickey noreply at git.blender.org
Tue Jan 14 17:23:44 CET 2014


Commit: c5d3abc8636808399629562dd0016051663fa00d
Author: Howard Trickey
Date:   Tue Jan 14 11:21:56 2014 -0500
https://developer.blender.org/rBc5d3abc8636808399629562dd0016051663fa00d

Bevel fix to clamping for percent type.

The clamp code is still very crude and over-conservative,
but was totally wrong for the percent amount type.

===================================================================

M	source/blender/bmesh/tools/bmesh_bevel.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 4207394..4789820 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3459,6 +3459,11 @@ static float bevel_limit_offset(BMesh *bm, BevelParams *bp)
 	bool vbeveled;
 
 	limited_offset = bp->offset;
+	if (bp->offset_type == BEVEL_AMT_PERCENT) {
+		if (limited_offset > 50.0f)
+			limited_offset = 50.0f;
+		return limited_offset;
+	}
 	BM_ITER_MESH (v, &v_iter, bm, BM_VERTS_OF_MESH) {
 		if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
 			if (bp->vertex_only) {




More information about the Bf-blender-cvs mailing list