diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-06-10 23:32:57 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-06-10 23:32:57 +0400 |
| commit | 298feff39006c14aa28b5e0232aa7ed70a83a496 (patch) | |
| tree | 652508be018e15344ccb69ab964d7b9acb622faa /source/gameengine/Converter | |
| parent | 88748904c68e88a2c5864a248419f7fad960695d (diff) | |
Committing patch [#31704] "Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker. This patch fixes [#31671] "Keyboard Sensor blocks Quit Game Key Binding"
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertSensors.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index fa9eb5317b9..2bd1688ca6d 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -302,7 +302,8 @@ void BL_ConvertSensors(struct Object* blenderobject, (blenderkeybdsensor->type == SENS_ALL_KEYS), blenderkeybdsensor->targetName, blenderkeybdsensor->toggleName, - gameobj); // blenderkeybdsensor->pad); + gameobj, + KX_KetsjiEngine::GetExitKey()); // blenderkeybdsensor->pad); } |