diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2006-06-15 01:04:53 +0400 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2006-06-15 01:04:53 +0400 |
commit | 0604c3a4ec5cad1182bb9e30e37ff71f7ee27337 (patch) | |
tree | b36ac666b76694a1f36a93fe6f6a5d278b6904bf /source/blender/src | |
parent | 1d44ad8b4cb10a16f788786d2feab121418e60de (diff) |
BUG #4323:
Help->System->Benchmark (the Tkey benchmark) returned timings even if
user cancelled the pupmenu. Was just missing a check
for -1 in toets.c -- wonder how old this one was... Reported by Wim Van
Hoydonck.
Scripts:
- Updated Jean-Michel's hotkeys script for Blender 2.42.
- Followed Pieter Visser's suggestion and added version info to the menu
names of the older collada scripts (v1.3.1).
Thanks guys!
Note for builders: nevermind if you already compiled 2.42RC1, these
updates are not critical at all and can be left for the release or RC2.
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/toets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index f261538253c..0da47d05781 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -781,6 +781,8 @@ int blenderqread(unsigned short event, short val) int a; double delta, stime; + if (event < 0) return 0; /* cancelled by user */ + waitcursor(1); stime= PIL_check_seconds_timer(); |