diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-23 11:46:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-23 11:46:34 +0400 |
commit | 01d4748e5feec2daf695aaabee84155c5b1ef91a (patch) | |
tree | 3bb4eea3971b6e2bc7f79544945effc857322ab9 /source/gameengine/Converter/KX_ConvertSensors.cpp | |
parent | 2ed155b98a52108a39133185b145ceee0d21ebf8 (diff) | |
parent | 4a4a3b4989355c699b72a8dc15df09fd47621528 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22704:22717
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertSensors.cpp')
-rw-r--r-- | source/gameengine/Converter/KX_ConvertSensors.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index eb77e087de5..09027f18844 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -536,6 +536,7 @@ void BL_ConvertSensors(struct Object* blenderobject, starty, keytype, trackfocus, + (bmouse->flag & SENS_MOUSE_FOCUS_PULSE) ? true:false, kxscene, kxengine, gameobj); |