Commit: d2ddc4b33c0c1ffd7cd7b4ac5ebb6ba4d5d5378f
Author: Bastien Montagne
Date: Fri May 8 10:29:59 2015 +0200
Branches: ui-preview-buttons
https://developer.blender.org/rBd2ddc4b33c0c1ffd7cd7b4ac5ebb6ba4d5d5378f
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...
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index eb19b9c..542955d 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
