diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 12:28:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 12:28:14 +0400 |
| commit | eff734203ff7a0f4a4f97015c9f1f59632c75abf (patch) | |
| tree | 8bcb05093f6a87ae154293e0b397f905e534669e /source/blender/windowmanager | |
| parent | 9dcd7f3b0b55e49a18296a67863368a0c4fca8b0 (diff) | |
add fallbacks for BM_vert_calc_shell_factor() and BM_vert_calc_mean_tagged_edge_length() to avoid divide by zero when a vertex has no connected geometry.
also style cleanup.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 236ab264f8c..14244de00f6 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2979,9 +2979,12 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U event.keymodifier = 0; /* if test_break set, it catches this. Do not set with modifier presses. XXX Keep global for now? */ - if (event.type == ESCKEY && event.val == KM_PRESS && - event.shift == 0 && event.ctrl == 0 && event.alt == 0) - G.is_break = TRUE; + if ((event.type == ESCKEY && event.val == KM_PRESS) && + /* check other modifiers because ms-windows uses these to bring up the task manager */ + (event.shift == 0 && event.ctrl == 0 && event.alt == 0)) + { + G.is_break = TRUE; + } /* double click test - only for press */ if (event.val == KM_PRESS) { |