diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2012-11-08 19:12:21 +0400 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2012-11-08 19:12:21 +0400 |
| commit | da4441f7c525ccfe88626eaa255a8bc179821d5a (patch) | |
| tree | a67e7f8e24f0f05bf43c50ebf4af96e705e4019b /source/blender/bmesh/intern/bmesh_opdefines.c | |
| parent | 7681488f974a52d74d37c2a173bd2c6a3cdfe1a5 (diff) | |
Merge gsoc Bevel (with rounding) into trunk.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_opdefines.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 31698f0abc1..398e6bbedcf 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1064,6 +1064,7 @@ static BMOpDefine bmo_create_cube_def = { 0, }; +#define NEW_BEVEL 1 /* * Bevel * @@ -1071,6 +1072,12 @@ static BMOpDefine bmo_create_cube_def = { */ static BMOpDefine bmo_bevel_def = { "bevel", +#ifdef NEW_BEVEL + {{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, /* input edges and vertices */ + {BMO_OP_SLOT_FLT, "offset"}, /* amount to offset beveled edge */ + {BMO_OP_SLOT_INT, "segments"}, /* number of segments in bevel */ + {0} /* null-terminating sentinel */}, +#else {{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, /* input edges and vertices */ {BMO_OP_SLOT_ELEMENT_BUF, "face_spans"}, /* new geometry */ {BMO_OP_SLOT_ELEMENT_BUF, "face_holes"}, /* new geometry */ @@ -1081,6 +1088,7 @@ static BMOpDefine bmo_bevel_def = { {BMO_OP_SLOT_INT, "lengthlayer"}, /* which PROP_FLT layer to us */ {BMO_OP_SLOT_FLT, "percent"}, /* percentage to expand beveled edge */ {0} /* null-terminating sentinel */}, +#endif bmo_bevel_exec, BMO_OP_FLAG_UNTAN_MULTIRES }; |