Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-05-08 11:29:59 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-05-08 11:29:59 +0300
commit9190d18b74fba4fc4134561e7a70190e12aeb045 (patch)
treea0c8e938054a4bc7be6a3e19b00c4e6ec659268d /source
parenta8da11c014a664afbec3c0fe6fbbc63e67d8dedc (diff)
Fix T44634: Slide edge not responding to ALT + WHEEL to change reference edge in "even mode".
Modal events (TFM_MODAL_EDGESLIDE_UP/_DOWN) were eaten by NOP generic transform event handling...
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/transform/transform.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index eb19b9cc855..542955d9dad 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1251,11 +1251,6 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
break;
- case TFM_MODAL_EDGESLIDE_UP:
- case TFM_MODAL_EDGESLIDE_DOWN:
- t->redraw |= TREDRAW_HARD;
- handled = true;
- break;
case TFM_MODAL_AUTOIK_LEN_INC:
if (t->flag & T_AUTOIK) {
transform_autoik_update(t, 1);
@@ -1270,6 +1265,9 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
break;
+ /* Those two are only handled in transform's own handler, see T44634! */
+ case TFM_MODAL_EDGESLIDE_UP:
+ case TFM_MODAL_EDGESLIDE_DOWN:
default:
break;
}
@@ -6272,12 +6270,12 @@ static eRedrawFlag handleEventEdgeSlide(struct TransInfo *t, const struct wmEven
case TFM_MODAL_EDGESLIDE_DOWN:
{
sld->curr_sv_index = ((sld->curr_sv_index - 1) + sld->totsv) % sld->totsv;
- break;
+ return TREDRAW_HARD;
}
case TFM_MODAL_EDGESLIDE_UP:
{
sld->curr_sv_index = (sld->curr_sv_index + 1) % sld->totsv;
- break;
+ return TREDRAW_HARD;
}
}
break;