diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 18:59:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 18:59:24 +0400 |
| commit | f62774505320a9e68001b9d3c1f655e354268473 (patch) | |
| tree | 9cadbccd54ca5982693d2d43b5f9cd9107c985dd | |
| parent | cb3dc8ff0ecb502716a1ca623a7079a647d0b3e7 (diff) | |
aparently `yards` are not used a lot, suppress their use in button display (input still knows about them) - was reported as a bug.
also fix minor rip bug where active selection was lost.
| -rw-r--r-- | source/blender/blenkernel/intern/unit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 7a71853641d..48e939be7e9 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -131,7 +131,7 @@ static struct bUnitDef buImperialLenDef[] = { {"mile", "miles", "mi", "m", "Miles", UN_SC_MI, 0.0, B_UNIT_DEF_NONE}, {"furlong", "furlongs", "fur", NULL, "Furlongs",UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS}, {"chain", "chains", "ch", NULL, "Chains", UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS}, - {"yard", "yards", "yd", NULL, "Yards", UN_SC_YD, 0.0, B_UNIT_DEF_NONE}, + {"yard", "yards", "yd", NULL, "Yards", UN_SC_YD, 0.0, B_UNIT_DEF_SUPPRESS}, {"foot", "feet", "'", "ft", "Feet", UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */ {"inch", "inches", "\"", "in", "Inches", UN_SC_IN, 0.0, B_UNIT_DEF_NONE}, {"thou", "thou", "thou", "mil", "Thou", UN_SC_MIL, 0.0, B_UNIT_DEF_NONE}, /* plural for thou has no 's' */ diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 751f0296e2d..7333bf9aa49 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -567,6 +567,9 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, wmEvent *event) if (v_best) { BM_elem_select_set(bm, v_best, TRUE); + if (ese.ele) { + EDBM_editselection_store(em, &v_best->head); + } } } |