[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52266] trunk/blender/source/blender/ modifiers/intern/MOD_bevel.c: minor edits so new bevel operator can be used from the modifier ( testing only, still disabled by default)
Campbell Barton
ideasman42 at gmail.com
Fri Nov 16 04:23:50 CET 2012
Revision: 52266
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52266
Author: campbellbarton
Date: 2012-11-16 03:23:46 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
minor edits so new bevel operator can be used from the modifier (testing only, still disabled by default)
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2012-11-16 01:54:11 UTC (rev 52265)
+++ trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2012-11-16 03:23:46 UTC (rev 52266)
@@ -92,7 +92,7 @@
#ifdef USE_BM_BEVEL_OP_AS_MOD
-#define EDGE_MARK 1
+#define GEOM_MARK 1
/* BMESH_TODO
*
@@ -116,7 +116,8 @@
BMIter iter;
BMEdge *e;
BevelModifierData *bmd = (BevelModifierData *) md;
- float threshold = cos((bmd->bevel_angle + 0.00001f) * M_PI / 180.0f);
+ float threshold = cos((bmd->bevel_angle + 0.00001f) * (float)M_PI / 180.0f);
+ const int segments = 16; /* XXX */
bm = DM_to_bmesh(dm);
@@ -131,7 +132,9 @@
(l2 = e->l->radial_next) != l1)
{
if (dot_v3v3(l1->f->no, l2->f->no) < threshold) {
- BMO_elem_flag_enable(bm, e, EDGE_MARK);
+ BMO_elem_flag_enable(bm, e, GEOM_MARK);
+ BMO_elem_flag_enable(bm, e->v1, GEOM_MARK);
+ BMO_elem_flag_enable(bm, e->v2, GEOM_MARK);
}
}
}
@@ -139,13 +142,15 @@
else {
/* crummy, is there a way just to operator on all? - campbell */
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
- BMO_elem_flag_enable(bm, e, EDGE_MARK);
+ BMO_elem_flag_enable(bm, e, GEOM_MARK);
+ BMO_elem_flag_enable(bm, e->v1, GEOM_MARK);
+ BMO_elem_flag_enable(bm, e->v2, GEOM_MARK);
}
}
BMO_op_callf(bm, BMO_FLAG_DEFAULTS,
- "bevel geom=%fe percent=%f use_even=%b use_dist=%b",
- EDGE_MARK, bmd->value, (bmd->flags & BME_BEVEL_EVEN) != 0, (bmd->flags & BME_BEVEL_DIST) != 0);
+ "bevel geom=%fve offset=%f segments=%i",
+ GEOM_MARK, bmd->value, segments);
BMO_pop(bm);
result = CDDM_from_bmesh(bm, TRUE);
More information about the Bf-blender-cvs
mailing list