[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52814] trunk/blender/source/blender/bmesh /tools/BME_bevel.c: fix [#33438] Bevel modifier "angle" mode is broken
Campbell Barton
ideasman42 at gmail.com
Sat Dec 8 08:36:01 CET 2012
Revision: 52814
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52814
Author: campbellbarton
Date: 2012-12-08 07:35:54 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
fix [#33438] Bevel modifier "angle" mode is broken
bevel modifier was making zero area faces & edges that made scanfill fail (since it no longer removes doubles when filling ngons)
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-12-08 02:16:17 UTC (rev 52813)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-12-08 07:35:54 UTC (rev 52814)
@@ -689,8 +689,16 @@
BMO_elem_flag_test(bm, l->v, BME_BEVEL_ORIG) &&
!BMO_elem_flag_test(bm, l->prev->e, BME_BEVEL_BEVEL))
{
- max = 1.0f;
- l = BME_bevel_vert(bm, l, value, options, up_vec, td);
+ /* avoid making double vertices [#33438] */
+ BME_TransData *vtd;
+ vtd = BME_get_transdata(td, l->v);
+ if (vtd->weight == 0.0f) {
+ BMO_elem_flag_disable(bm, l->v, BME_BEVEL_BEVEL);
+ }
+ else {
+ max = 1.0f;
+ l = BME_bevel_vert(bm, l, value, options, up_vec, td);
+ }
}
}
More information about the Bf-blender-cvs
mailing list