diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2012-09-12 17:17:22 +0400 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2012-09-12 17:17:22 +0400 |
| commit | 4446ff3cd58a69e84657dda9f423cf3d82614a52 (patch) | |
| tree | 0e18c0a575559353ef98396abf412fc12c97f93a /source/blender/editors/mesh | |
| parent | cf3a0e0139b179432025412f3202f71ef518d5de (diff) | |
Fixed a disconnected vertex in bevel; fixed header print for bevel.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 25ac0b1b5ac..e0319473f4f 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4554,7 +4554,11 @@ typedef struct { static void edbm_bevel_update_header(wmOperator *op, bContext *C) { +#ifdef OLDBEV static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RMB), factor: %s, Use Dist (D): %s: Use Even (E): %s"; +#else + static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RMB), factor: %s, segments: %d"; +#endif char msg[HEADER_LENGTH]; ScrArea *sa = CTX_wm_area(C); @@ -4566,6 +4570,7 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C) outputNumInput(&opdata->num_input, factor_str); else BLI_snprintf(factor_str, NUM_STR_REP_LEN, "%f", RNA_float_get(op->ptr, "percent")); +#ifdef OLDBEV BLI_snprintf(msg, HEADER_LENGTH, str, factor_str, RNA_boolean_get(op->ptr, "use_dist") ? "On" : "Off", @@ -4574,6 +4579,9 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C) RNA_float_get(op->ptr, "Amount"), RNA_int_get(op->ptr, "Segmentation") ); +#else + BLI_snprintf(msg, HEADER_LENGTH, str, factor_str, RNA_int_get(op->ptr, "segmentation")); +#endif ED_area_headerprint(sa, msg); } |